rename ruserpass to ruserpassword to not collide with uclibc, prompted by [HEIMDAL...

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25331 ec53bebd-3082-4978-b11e-865c3cabbd6b

diff --git a/appl/ftp/ftp/extern.h b/appl/ftp/ftp/extern.h
index f47e56814ff42fdd3c8b32266900dfde73139e16..ee5184957fb1d88c9f68c6b052483a53e9af5b13 100644 (file)
--- a/appl/ftp/ftp/extern.h
+++ b/appl/ftp/ftp/extern.h
@@ -117,7 +117,7 @@ void    reset (int, char **);
 void   restart (int, char **);
 void   rmthelp (int, char **);
 void   rmtstatus (int, char **);
-int    ruserpass (char *, char **, char **, char **);
+int    ruserpassword (char *, char **, char **, char **);
 void    sendrequest (char *, char *, char *, char *, int);
 void   setascii (int, char **);
 void   setbell (int, char **);

diff --git a/appl/ftp/ftp/ftp.c b/appl/ftp/ftp/ftp.c
index a2ffd4ae163dc7761825da61fd38ad348e5dd715..b6e58b30858db7a7b0dcebef4037f98879be9f11 100644 (file)
--- a/appl/ftp/ftp/ftp.c
+++ b/appl/ftp/ftp/ftp.c
@@ -184,7 +184,7 @@ login (char *host)
        printf("Authentication successful.\n\n");
     }
 
-    if (ruserpass (host, &ruserstr, &rpass, &racctstr) < 0) {
+    if (ruserpassword (host, &ruserstr, &rpass, &racctstr) < 0) {
        code = -1;
        return (0);
     }

diff --git a/appl/ftp/ftp/globals.c b/appl/ftp/ftp/globals.c
index 0531ef152588abe0db1d6fd9504a0c776c645a2a..4c195f6e9e58d9d0414f633dabb6dff15ac04f38 100644 (file)
--- a/appl/ftp/ftp/globals.c
+++ b/appl/ftp/ftp/globals.c
@@ -74,6 +74,6 @@ char macbuf[4096];
 
 char username[32];
 
-/* these are set in ruserpass */
+/* these are set in ruserpassword */
 char myhostname[MaxHostNameLen];
 char *mydomain;

diff --git a/appl/ftp/ftp/ruserpass.c b/appl/ftp/ftp/ruserpass.c
index 3913788c64b8fa6c6a0c77feca564254e43fcda5..a8665b643c53452ddc72d0f94a6196c7c11d9f01 100644 (file)
--- a/appl/ftp/ftp/ruserpass.c
+++ b/appl/ftp/ftp/ruserpass.c
@@ -105,7 +105,7 @@ guess_domain (char *hostname_str, size_t sz)
 }
 
 int
-ruserpass(char *host, char **aname, char **apass, char **aacct)
+ruserpassword(char *host, char **aname, char **apass, char **aacct)
 {
     char *hdir, buf[BUFSIZ], *tmp;
     int t, i, c, usedefault = 0;