diff options
| author | Tom Yu <tlyu@mit.edu> | 1998-02-23 01:13:26 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1998-02-23 01:13:26 +0000 |
| commit | 2a09b1e130d81059e3ba16c434945b121a221869 (patch) | |
| tree | 03d93b08d46f6d3a76647790ac78cd0d4af9990e /src | |
| parent | 04f398c083f719d460d2d21eb09b5c75221ae067 (diff) | |
* v4rcp.c: Punt nastiness to redefine setreuid, as we don't use
it.
* krcp.c: Use krb5_seteuid(). [krb5-libs/505] Fix up inclusions
to use <> rather than "".
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10469 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/bsd/ChangeLog | 8 | ||||
| -rw-r--r-- | src/appl/bsd/krcp.c | 27 | ||||
| -rw-r--r-- | src/appl/bsd/v4rcp.c | 11 |
3 files changed, 18 insertions, 28 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 30a17509d5..9ab4cc1617 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,11 @@ +Sun Feb 22 19:16:12 1998 Tom Yu <tlyu@mit.edu> + + * v4rcp.c: Punt nastiness to redefine setreuid, as we don't use + it. + + * krcp.c: Use krb5_seteuid(). [krb5-libs/505] Fix up inclusions + to use <> rather than "". + Wed Feb 18 15:26:52 1998 Tom Yu <tlyu@mit.edu> * Makefile.in: Remove trailing slash from thisconfigdir. Fix up diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c index 5da0fadc00..a6fe0dc7ef 100644 --- a/src/appl/bsd/krcp.c +++ b/src/appl/bsd/krcp.c @@ -65,21 +65,16 @@ char copyright[] = #else #include <varargs.h> #endif - -#ifdef HAVE_SETRESUID -#ifndef HAVE_SETREUID -#define HAVE_SETREUID -#define setreuid(r,e) setresuid(r,e,-1) -#endif -#endif + #ifndef roundup #define roundup(x,y) ((((x)+(y)-1)/(y))*(y)) #endif #ifdef KERBEROS -#include "krb5.h" -#include "com_err.h" - +#include <krb5.h> +#include <k5-util.h> +#include <com_err.h> + #define RCP_BUFSIZ 4096 int sock; @@ -546,26 +541,18 @@ krb5_creds *cred; } euid = geteuid(); -#ifdef HAVE_SETREUID - if (euid == 0) - (void) setreuid(0, userid); - sink(1, argv+argc-1); - if (euid == 0) - (void) setreuid(userid, 0); -#else if (euid == 0) { (void) setuid(0); - if(seteuid(userid)) { + if(krb5_seteuid(userid)) { perror("rcp seteuid user"); errs++; exit(errs); } } sink(1, argv+argc-1); if (euid == 0) { - if(seteuid(0)) { + if(krb5_seteuid(0)) { perror("rcp seteuid 0"); errs++; exit(errs); } } -#endif #else rem = rcmd(&host, port, pwd->pw_name, suser, buf, 0); diff --git a/src/appl/bsd/v4rcp.c b/src/appl/bsd/v4rcp.c index 5c0b5896c2..7461b25ff4 100644 --- a/src/appl/bsd/v4rcp.c +++ b/src/appl/bsd/v4rcp.c @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)rcp.c 5.10 (Berkeley) 9/20/88"; * rcp */ #ifdef KERBEROS -#include "krb5.h" -#include "com_err.h" +#include <krb5.h> +#include <com_err.h> +#include <k5-util.h> #endif #ifdef HAVE_UNISTD_H @@ -286,12 +287,6 @@ int kstream_write(krem, buf, len) #define vfork fork #endif -#ifdef hpux -#define setreuid(r,e) setresuid(r,e,-1) -#endif -#ifdef __svr4__ -#define setreuid(r,e) setuid(r) -#endif #ifndef roundup #define roundup(x,y) ((((x)+(y)-1)/(y))*(y)) #endif |