From d07832d6d7fd03a2457bca399593d4fd228509b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Wed, 15 Jul 2009 23:07:07 +0000
Subject: [PATCH] rename ruserpass to ruserpassword to not collide with uclibc,
 prompted by [HEIMDAL-534]

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25331 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftp/extern.h    | 2 +-
 appl/ftp/ftp/ftp.c       | 2 +-
 appl/ftp/ftp/globals.c   | 2 +-
 appl/ftp/ftp/ruserpass.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appl/ftp/ftp/extern.h b/appl/ftp/ftp/extern.h
index f47e56814..ee5184957 100644
--- 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 a2ffd4ae1..b6e58b308 100644
--- 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 0531ef152..4c195f6e9 100644
--- 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 3913788c6..a8665b643 100644
--- 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;