casa-mp-base

--- common.h    2007-05-05 12:17:26.000000000 +0200

+++ common.h    2011-09-02 21:40:45.000000000 +0200

@@ -273,7 +273,7 @@ void pipeview_wait(int pid);

 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);

--- ldapvi.c    2007-05-05 12:17:26.000000000 +0200

+++ ldapvi.c    2011-09-02 21:41:17.000000000 +0200

@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)

        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

--- misc.c  2007-05-05 12:17:26.000000000 +0200

+++ misc.c  2011-09-02 21:41:45.000000000 +0200

@@ -315,7 +315,7 @@ write_ldapvi_history()

 }

 char *

-getline(char *prompt, char *value)

+ldapvi_getline(char *prompt, char *value)

 {

    tdialog d;

    init_dialog(&d, DIALOG_DEFAULT, prompt, value);