oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename ruserpass to ruserpassword to not collide with uclibc, prompted by [HEIMDAL-534]

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25331 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-07-15 23:07:07 +00:00
parent 29fc07df5b
commit d07832d6d7
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appl/ftp/ftp/extern.h
View File

@@ -117,7 +117,7 @@ void reset (int, char **);
void restart (int, char **); void restart (int, char **);
void rmthelp (int, char **); void rmthelp (int, char **);
void rmtstatus (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 sendrequest (char *, char *, char *, char *, int);
void setascii (int, char **); void setascii (int, char **);
void setbell (int, char **); void setbell (int, char **);

2
appl/ftp/ftp/ftp.c
View File

@@ -184,7 +184,7 @@ login (char *host)
printf("Authentication successful.\n\n"); printf("Authentication successful.\n\n");
} }
if (ruserpass (host, &ruserstr, &rpass, &racctstr) < 0) { if (ruserpassword (host, &ruserstr, &rpass, &racctstr) < 0) {
code = -1; code = -1;
return (0); return (0);
} }

2
appl/ftp/ftp/globals.c
View File

@@ -74,6 +74,6 @@ char macbuf[4096];
char username[32]; char username[32];
/* these are set in ruserpass */ /* these are set in ruserpassword */
char myhostname[MaxHostNameLen]; char myhostname[MaxHostNameLen];
char *mydomain; char *mydomain;

2
appl/ftp/ftp/ruserpass.c
View File

@@ -105,7 +105,7 @@ guess_domain (char *hostname_str, size_t sz)
} }
int int
ruserpass(char *host, char **aname, char **apass, char **aacct) ruserpassword(char *host, char **aname, char **apass, char **aacct)
{ {
char *hdir, buf[BUFSIZ], *tmp; char *hdir, buf[BUFSIZ], *tmp;
int t, i, c, usedefault = 0; int t, i, c, usedefault = 0;