1 diff -uNr ldapvi-1.7.orig/common.h ldapvi-1.7/common.h
2 --- ldapvi-1.7.orig/common.h 2007-05-05 12:17:26.000000000 +0200
3 +++ ldapvi-1.7/common.h 2009-06-20 18:51:31.000000000 +0200
5 char *home_filename(char *name);
6 void read_ldapvi_history(void);
7 void write_ldapvi_history(void);
8 -char *getline(char *prompt, char *value);
9 +char *ldapvi_getline(char *prompt, char *value);
11 char *append(char *a, char *b);
12 void *xalloc(size_t size);
13 diff -uNr ldapvi-1.7.orig/ldapvi.c ldapvi-1.7/ldapvi.c
14 --- ldapvi-1.7.orig/ldapvi.c 2007-05-05 12:17:26.000000000 +0200
15 +++ ldapvi-1.7/ldapvi.c 2009-06-20 18:51:31.000000000 +0200
17 bo->authmethod = LDAP_AUTH_SASL;
18 puts("Switching to SASL authentication.");
20 - bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
21 + bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
25 diff -uNr ldapvi-1.7.orig/misc.c ldapvi-1.7/misc.c
26 --- ldapvi-1.7.orig/misc.c 2007-05-05 12:17:26.000000000 +0200
27 +++ ldapvi-1.7/misc.c 2009-06-20 18:51:31.000000000 +0200
32 -getline(char *prompt, char *value)
33 +ldapvi_getline(char *prompt, char *value)
36 init_dialog(&d, DIALOG_DEFAULT, prompt, value);