[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-65-g5e52b86

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  5e52b86b129eb460085bfcbaf0e243ad52328a2e (commit)
      from  31d3b8e6a669c127fd6fbb6173a5d1a370d811af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=5e52b86b129eb460085bfcbaf0e243ad52328a2e


commit 5e52b86b129eb460085bfcbaf0e243ad52328a2e
Author: Mike Frysinger <address@hidden>
Date:   Fri Nov 19 02:04:53 2010 -0500

    ftp: rename ruserpass to avoid C library collision
    
    The C library itself defines a "ruserpass" function.  When linking
    statically, it is possible to hit a symbol collision linker error.
    So rename the local ftp version to "remote_userpass".
    
    Signed-off-by: Mike Frysinger <address@hidden>
    Signed-off-by: Simon Josefsson <address@hidden>

diff --git a/ChangeLog b/ChangeLog
index f757a82..c75d8b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-19  Mike Frysinger <address@hidden>
+
+       * ftp/extern.h: Rename function ruserpass to remote_userpass.
+       * ftp/ftp.c (login): Call remote_userpass instead of ruserpass.
+       * ftp/ruserpass.c (remote_userpass): Renamed from ruserpass.
+
 2010-10-31  Mats Erik Andersson <address@hidden>
 
        * ifconfig/if_index.c (if_nametoindex, if_freenameindex)
diff --git a/ftp/extern.h b/ftp/extern.h
index 8cdb8aa..037cb61 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -119,7 +119,7 @@ void reset (int, char **);
 void restart (int, char **);
 void rmthelp (int, char **);
 void rmtstatus (int, char **);
-int ruserpass (char *, char **, char **, char **);
+int remote_userpass (char *, char **, char **, char **);
 void sendrequest (char *, char *, char *, int);
 void setascii (int, char **);
 void setbell (int, char **);
diff --git a/ftp/ftp.c b/ftp/ftp.c
index c20ba41..95675cc 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -251,7 +251,7 @@ login (char *host)
   int n, aflag = 0;
 
   user = pass = acct = 0;
-  if (ruserpass (host, &user, &pass, &acct) < 0)
+  if (remote_userpass (host, &user, &pass, &acct) < 0)
     {
       code = -1;
       return (0);
diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c
index 8572b95..c08fbc0 100644
--- a/ftp/ruserpass.c
+++ b/ftp/ruserpass.c
@@ -111,7 +111,7 @@ static struct toktab
 };
 
 int
-ruserpass (char *host, char **aname, char **apass, char **aacct)
+remote_userpass (char *host, char **aname, char **apass, char **aacct)
 {
   char *hdir, buf[BUFSIZ], *tmp;
   char *myname = 0, *mydomain;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    6 ++++++
 ftp/extern.h    |    2 +-
 ftp/ftp.c       |    2 +-
 ftp/ruserpass.c |    2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils