diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch')
-rw-r--r-- | meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch b/meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch deleted file mode 100644 index a6e366da7..000000000 --- a/meta-oe/recipes-connectivity/inetutils/inetutils-1.8/inetutils-1.8-1001-ftp-rename-ruserpass-to-avoid-C-library-collision.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From 4f890adb39b52bc43c578966071625004988e3b8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mike Frysinger <vapier at gentoo.org> | ||
3 | Date: Thu, 18 Nov 2010 22:11:48 -0500 | ||
4 | Subject: [PATCH] ftp: rename ruserpass to avoid C library collision | ||
5 | |||
6 | The C library itself defines a "ruserpass" function. When linking | ||
7 | statically, it is possible to hit a symbol collision linker error. | ||
8 | So rename the local ftp version to "remote_userpass". | ||
9 | |||
10 | Signed-off-by: Mike Frysinger <vapier at gentoo.org> | ||
11 | --- | ||
12 | ftp/extern.h | 2 +- | ||
13 | ftp/ftp.c | 2 +- | ||
14 | ftp/ruserpass.c | 2 +- | ||
15 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/ftp/extern.h b/ftp/extern.h | ||
18 | index 8cdb8aa..037cb61 100644 | ||
19 | --- a/ftp/extern.h | ||
20 | +++ b/ftp/extern.h | ||
21 | @@ -119,7 +119,7 @@ void reset (int, char **); | ||
22 | void restart (int, char **); | ||
23 | void rmthelp (int, char **); | ||
24 | void rmtstatus (int, char **); | ||
25 | -int ruserpass (char *, char **, char **, char **); | ||
26 | +int remote_userpass (char *, char **, char **, char **); | ||
27 | void sendrequest (char *, char *, char *, int); | ||
28 | void setascii (int, char **); | ||
29 | void setbell (int, char **); | ||
30 | diff --git a/ftp/ftp.c b/ftp/ftp.c | ||
31 | index c20ba41..95675cc 100644 | ||
32 | --- a/ftp/ftp.c | ||
33 | +++ b/ftp/ftp.c | ||
34 | @@ -251,7 +251,7 @@ login (char *host) | ||
35 | int n, aflag = 0; | ||
36 | |||
37 | user = pass = acct = 0; | ||
38 | - if (ruserpass (host, &user, &pass, &acct) < 0) | ||
39 | + if (remote_userpass (host, &user, &pass, &acct) < 0) | ||
40 | { | ||
41 | code = -1; | ||
42 | return (0); | ||
43 | diff --git a/ftp/ruserpass.c b/ftp/ruserpass.c | ||
44 | index 8572b95..c08fbc0 100644 | ||
45 | --- a/ftp/ruserpass.c | ||
46 | +++ b/ftp/ruserpass.c | ||
47 | @@ -111,7 +111,7 @@ static struct toktab | ||
48 | }; | ||
49 | |||
50 | int | ||
51 | -ruserpass (char *host, char **aname, char **apass, char **aacct) | ||
52 | +remote_userpass (char *host, char **aname, char **apass, char **aacct) | ||
53 | { | ||
54 | char *hdir, buf[BUFSIZ], *tmp; | ||
55 | char *myname = 0, *mydomain; | ||
56 | -- | ||
57 | 1.7.3.2 | ||
58 | |||