--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SOURCES/ldapvi-1.7-getline.diff	Mon Nov 28 16:25:23 2011 +0100
@@ -0,0 +1,36 @@
+diff -r 9b63083c0717 -r 038856dd5d0b common.h
+--- a/common.h	Mon Nov 28 14:17:13 2011 +0100
++++ b/common.h	Mon Nov 28 14:21:56 2011 +0100
+@@ -273,7 +273,7 @@
+ char *home_filename(char *name);
+ void read_ldapvi_history(void);
+ void write_ldapvi_history(void);
+-char *getline(char *prompt, char *value);
++char *ldapvi_getline(char *prompt, char *value);
+ char *get_password();
+ char *append(char *a, char *b);
+ void *xalloc(size_t size);
+diff -r 9b63083c0717 -r 038856dd5d0b ldapvi.c
+--- a/ldapvi.c	Mon Nov 28 14:17:13 2011 +0100
++++ b/ldapvi.c	Mon Nov 28 14:21:56 2011 +0100
+@@ -470,7 +470,7 @@
+ 		bo->authmethod = LDAP_AUTH_SASL;
+ 		puts("Switching to SASL authentication.");
+ 	}
+-	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
++	bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
+ }
+ 
+ static int
+diff -r 9b63083c0717 -r 038856dd5d0b misc.c
+--- a/misc.c	Mon Nov 28 14:17:13 2011 +0100
++++ b/misc.c	Mon Nov 28 14:21:56 2011 +0100
+@@ -315,7 +315,7 @@
+ }
+ 
+ char *
+-getline(char *prompt, char *value)
++ldapvi_getline(char *prompt, char *value)
+ {
+ 	tdialog d;
+ 	init_dialog(&d, DIALOG_DEFAULT, prompt, value);