| 1 |
Description: rename internal getline function to avoid conflict |
| 2 |
Origin: upstream, commit:bf7af39b |
| 3 |
Bug-Debian: http://bugs.debian.org/552868 |
| 4 |
Author: David Lichteblau <[email protected]> |
| 5 |
|
| 6 |
Index: ldapvi-1.7/common.h |
| 7 |
=================================================================== |
| 8 |
--- ldapvi-1.7.orig/common.h |
| 9 |
+++ ldapvi-1.7/common.h |
| 10 |
@@ -273,7 +273,7 @@ void pipeview_wait(int pid); |
| 11 |
char *home_filename(char *name); |
| 12 |
void read_ldapvi_history(void); |
| 13 |
void write_ldapvi_history(void); |
| 14 |
-char *getline(char *prompt, char *value); |
| 15 |
+char *ldapvi_getline(char *prompt, char *value); |
| 16 |
char *get_password(); |
| 17 |
char *append(char *a, char *b); |
| 18 |
void *xalloc(size_t size); |
| 19 |
Index: ldapvi-1.7/misc.c |
| 20 |
=================================================================== |
| 21 |
--- ldapvi-1.7.orig/misc.c |
| 22 |
+++ ldapvi-1.7/misc.c |
| 23 |
@@ -319,7 +319,7 @@ write_ldapvi_history() |
| 24 |
} |
| 25 |
|
| 26 |
char * |
| 27 |
-getline(char *prompt, char *value) |
| 28 |
+ldapvi_getline(char *prompt, char *value) |
| 29 |
{ |
| 30 |
tdialog d; |
| 31 |
init_dialog(&d, DIALOG_DEFAULT, prompt, value); |
| 32 |
Index: ldapvi-1.7/ldapvi.c |
| 33 |
=================================================================== |
| 34 |
--- ldapvi-1.7.orig/ldapvi.c |
| 35 |
+++ ldapvi-1.7/ldapvi.c |
| 36 |
@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo) |
| 37 |
bo->authmethod = LDAP_AUTH_SASL; |
| 38 |
puts("Switching to SASL authentication."); |
| 39 |
} |
| 40 |
- bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech); |
| 41 |
+ bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech); |
| 42 |
} |
| 43 |
|
| 44 |
static int |