diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 1999-10-04 14:32:28 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 1999-10-04 14:32:28 +0000 |
| commit | 5f0c4b6514ad7dd7f1d2f8fa1f6a5559be2bd227 (patch) | |
| tree | ca29aa15332588c4c57742bcac914fe5f6467f33 /security/krb5-appl/files | |
| parent | Upgrade to 1.0.4. (diff) | |
Update 1.0.6 -> 1.1
Notes
Notes:
svn path=/head/; revision=22159
Diffstat (limited to 'security/krb5-appl/files')
| -rw-r--r-- | security/krb5-appl/files/patch-ai | 42 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-aj | 27 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-as | 4 | ||||
| -rw-r--r-- | security/krb5-appl/files/patch-av | 10 |
4 files changed, 25 insertions, 58 deletions
diff --git a/security/krb5-appl/files/patch-ai b/security/krb5-appl/files/patch-ai index 5eacca9caf86..ddfff3d3aff9 100644 --- a/security/krb5-appl/files/patch-ai +++ b/security/krb5-appl/files/patch-ai @@ -1,25 +1,17 @@ -*** appl/gssftp/ftpd/ftpd.c.ORIG Fri Feb 6 19:41:25 1998 ---- appl/gssftp/ftpd/ftpd.c Tue Jun 30 19:46:01 1998 -*************** -*** 374,380 **** - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); ---- 374,386 ---- - #ifndef LOG_DAEMON - #define LOG_DAEMON 0 - #endif -! -! #ifndef LOG_FTP -! #define FACILITY LOG_DAEMON -! #else -! #define FACILITY LOG_FTP -! #endif -! openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); - addrlen = sizeof (his_addr); - if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { - syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); +--- appl/gssftp/ftpd/ftpd.c.orig Wed Sep 1 13:38:40 1999 ++++ appl/gssftp/ftpd/ftpd.c Sat Sep 25 10:25:04 1999 +@@ -477,7 +477,13 @@ + #ifndef LOG_DAEMON + #define LOG_DAEMON 0 + #endif +- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON); ++ ++#ifndef LOG_FTP ++#define FACILITY LOG_DAEMON ++#else ++#define FACILITY LOG_FTP ++#endif ++ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY); + + addrlen = sizeof (his_addr); + if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) { diff --git a/security/krb5-appl/files/patch-aj b/security/krb5-appl/files/patch-aj index 29e845803294..c3bb8dfd6960 100644 --- a/security/krb5-appl/files/patch-aj +++ b/security/krb5-appl/files/patch-aj @@ -1,33 +1,6 @@ *** appl/gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998 --- appl/gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998 *************** -*** 44,55 **** - #include <unistd.h> - #include <string.h> - -! #ifdef WTMP_FILE -! #define WTMPFILE WTMP_FILE - #endif - -! #ifndef WTMPFILE -! #define WTMPFILE "/usr/adm/wtmp" - #endif - - static int fd = -1; ---- 44,55 ---- - #include <unistd.h> - #include <string.h> - -! #if !defined(WTMP_FILE) && defined(_PATH_WTMP) -! #define WTMP_FILE _PATH_WTMP - #endif - -! #ifndef WTMP_FILE -! #define WTMP_FILE "/usr/adm/wtmp" - #endif - - static int fd = -1; -*************** *** 66,72 **** struct stat buf; time_t time(); diff --git a/security/krb5-appl/files/patch-as b/security/krb5-appl/files/patch-as index 8ab90bb8494e..519a1c74d4cb 100644 --- a/security/krb5-appl/files/patch-as +++ b/security/krb5-appl/files/patch-as @@ -42,7 +42,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; @@ -50,7 +50,7 @@ } -! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != EOF)){ +! while(!done && ((option = getopt(pargc, pargv,"n:c:C:r:a:zZDfpkmql:e:")) != -1)){ switch (option) { case 'r': options.opt |= KDC_OPT_RENEWABLE; diff --git a/security/krb5-appl/files/patch-av b/security/krb5-appl/files/patch-av index 86bd04e8ad23..8363b8bb1e2d 100644 --- a/security/krb5-appl/files/patch-av +++ b/security/krb5-appl/files/patch-av @@ -1,13 +1,15 @@ *** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998 --- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998 *************** -*** 1,4 **** +*** 3,7 **** + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ ---- 1,4 ---- +--- 3,7 ---- + mydir=ksu + BUILDTOP=$(REL)$(U)$(S)$(U) ! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) - KSU_LIBS=@KSU_LIBS@ |