aboutsummaryrefslogtreecommitdiffstats
path: root/main/ldapvi/ldapvi_getline.patch
blob: f839107b3d61a5563177794870ec8a2eb83f6e75 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
diff -uNr ldapvi-1.7.orig/common.h ldapvi-1.7/common.h
--- ldapvi-1.7.orig/common.h	2007-05-05 12:17:26.000000000 +0200
+++ ldapvi-1.7/common.h	2009-06-20 18:51:31.000000000 +0200
@@ -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 -uNr ldapvi-1.7.orig/ldapvi.c ldapvi-1.7/ldapvi.c
--- ldapvi-1.7.orig/ldapvi.c	2007-05-05 12:17:26.000000000 +0200
+++ ldapvi-1.7/ldapvi.c	2009-06-20 18:51:31.000000000 +0200
@@ -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 -uNr ldapvi-1.7.orig/misc.c ldapvi-1.7/misc.c
--- ldapvi-1.7.orig/misc.c	2007-05-05 12:17:26.000000000 +0200
+++ ldapvi-1.7/misc.c	2009-06-20 18:51:31.000000000 +0200
@@ -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);