1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

- cleanup patches

(only context changed)
This commit is contained in:
Dirk Meyer 2004-10-12 04:42:53 +00:00
parent 5f86da4fbe
commit cdfe97f541
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=118777
10 changed files with 42 additions and 42 deletions

View File

@ -1,8 +1,8 @@
--- auth.c.orig Tue Sep 2 23:32:46 2003
+++ auth.c Tue Sep 16 20:05:44 2003
@@ -259,6 +259,17 @@
}
#endif /* WITH_AIXAUTHENTICATE */
--- auth.c.orig Thu Aug 12 14:40:25 2004
+++ auth.c Mon Sep 20 05:04:48 2004
@@ -208,6 +208,17 @@
return 0;
#endif
+#ifdef __FreeBSD__
+ /* Fail if the account's expiration time has passed. */
@ -18,7 +18,7 @@
/* We found no reason not to let this user try to log on... */
return 1;
}
@@ -531,7 +542,7 @@
@@ -472,7 +483,7 @@
if (!allowed_user(pw))
return (NULL);
#ifdef HAVE_LOGIN_CAP

View File

@ -1,5 +1,5 @@
--- auth2.c.orig Tue Sep 2 23:32:46 2003
+++ auth2.c Tue Sep 16 20:05:44 2003
--- auth2.c.orig Thu Aug 12 14:40:25 2004
+++ auth2.c Mon Sep 20 05:04:48 2004
@@ -35,6 +35,7 @@
#include "dispatch.h"
#include "pathnames.h"
@ -8,7 +8,7 @@
#ifdef GSSAPI
#include "ssh-gss.h"
@@ -143,6 +144,15 @@
@@ -134,6 +135,15 @@
Authmethod *m = NULL;
char *user, *service, *method, *style = NULL;
int authenticated = 0;
@ -24,7 +24,7 @@
if (authctxt == NULL)
fatal("input_userauth_request: no authctxt");
@@ -187,6 +197,41 @@
@@ -178,6 +188,41 @@
"(%s,%s) -> (%s,%s)",
authctxt->user, authctxt->service, user, service);
}

View File

@ -1,6 +1,6 @@
--- clientloop.c.orig Fri Apr 20 09:17:51 2001
+++ clientloop.c Sat May 26 15:18:51 2001
@@ -1131,7 +1131,7 @@
--- clientloop.c.orig Fri Aug 13 13:18:01 2004
+++ clientloop.c Mon Sep 20 05:04:48 2004
@@ -1581,7 +1581,7 @@
if (strcmp(ctype, "forwarded-tcpip") == 0) {
c = client_request_forwarded_tcpip(ctype, rchan);

View File

@ -1,6 +1,6 @@
--- loginrec.c.orig Thu Sep 26 02:38:49 2002
+++ loginrec.c Mon Oct 21 06:51:34 2002
@@ -172,6 +172,9 @@
--- loginrec.c.orig Sun Aug 15 11:12:52 2004
+++ loginrec.c Mon Sep 20 05:04:48 2004
@@ -167,6 +167,9 @@
#ifdef HAVE_LIBUTIL_H
# include <libutil.h>
#endif
@ -10,7 +10,7 @@
/**
** prototypes for helper functions in this file
@@ -654,7 +657,12 @@
@@ -657,7 +660,12 @@
/* Use strncpy because we don't necessarily want null termination */
strncpy(ut->ut_name, li->username, MIN_SIZEOF(ut->ut_name, li->username));
# ifdef HAVE_HOST_IN_UTMP

View File

@ -1,14 +1,14 @@
--- sshd_config.orig Tue Sep 2 14:51:18 2003
+++ sshd_config Tue Sep 16 20:05:44 2003
--- sshd_config.orig Mon May 24 02:36:24 2004
+++ sshd_config Mon Sep 20 05:04:48 2004
@@ -34,6 +34,7 @@
#LoginGraceTime 2m
#PermitRootLogin yes
+PermitRootLogin no
#StrictModes yes
#MaxAuthTries 6
#RSAAuthentication yes
@@ -56,6 +57,7 @@
@@ -57,6 +58,7 @@
# Change to no to disable s/key passwords
#ChallengeResponseAuthentication yes

View File

@ -1,8 +1,8 @@
--- auth.c.orig Tue Sep 2 23:32:46 2003
+++ auth.c Tue Sep 16 20:05:44 2003
@@ -259,6 +259,17 @@
}
#endif /* WITH_AIXAUTHENTICATE */
--- auth.c.orig Thu Aug 12 14:40:25 2004
+++ auth.c Mon Sep 20 05:04:48 2004
@@ -208,6 +208,17 @@
return 0;
#endif
+#ifdef __FreeBSD__
+ /* Fail if the account's expiration time has passed. */
@ -18,7 +18,7 @@
/* We found no reason not to let this user try to log on... */
return 1;
}
@@ -531,7 +542,7 @@
@@ -472,7 +483,7 @@
if (!allowed_user(pw))
return (NULL);
#ifdef HAVE_LOGIN_CAP

View File

@ -1,5 +1,5 @@
--- auth2.c.orig Tue Sep 2 23:32:46 2003
+++ auth2.c Tue Sep 16 20:05:44 2003
--- auth2.c.orig Thu Aug 12 14:40:25 2004
+++ auth2.c Mon Sep 20 05:04:48 2004
@@ -35,6 +35,7 @@
#include "dispatch.h"
#include "pathnames.h"
@ -8,7 +8,7 @@
#ifdef GSSAPI
#include "ssh-gss.h"
@@ -143,6 +144,15 @@
@@ -134,6 +135,15 @@
Authmethod *m = NULL;
char *user, *service, *method, *style = NULL;
int authenticated = 0;
@ -24,7 +24,7 @@
if (authctxt == NULL)
fatal("input_userauth_request: no authctxt");
@@ -187,6 +197,41 @@
@@ -178,6 +188,41 @@
"(%s,%s) -> (%s,%s)",
authctxt->user, authctxt->service, user, service);
}

View File

@ -1,6 +1,6 @@
--- clientloop.c.orig Fri Apr 20 09:17:51 2001
+++ clientloop.c Sat May 26 15:18:51 2001
@@ -1131,7 +1131,7 @@
--- clientloop.c.orig Fri Aug 13 13:18:01 2004
+++ clientloop.c Mon Sep 20 05:04:48 2004
@@ -1581,7 +1581,7 @@
if (strcmp(ctype, "forwarded-tcpip") == 0) {
c = client_request_forwarded_tcpip(ctype, rchan);

View File

@ -1,6 +1,6 @@
--- loginrec.c.orig Thu Sep 26 02:38:49 2002
+++ loginrec.c Mon Oct 21 06:51:34 2002
@@ -172,6 +172,9 @@
--- loginrec.c.orig Sun Aug 15 11:12:52 2004
+++ loginrec.c Mon Sep 20 05:04:48 2004
@@ -167,6 +167,9 @@
#ifdef HAVE_LIBUTIL_H
# include <libutil.h>
#endif
@ -10,7 +10,7 @@
/**
** prototypes for helper functions in this file
@@ -654,7 +657,12 @@
@@ -657,7 +660,12 @@
/* Use strncpy because we don't necessarily want null termination */
strncpy(ut->ut_name, li->username, MIN_SIZEOF(ut->ut_name, li->username));
# ifdef HAVE_HOST_IN_UTMP

View File

@ -1,14 +1,14 @@
--- sshd_config.orig Tue Sep 2 14:51:18 2003
+++ sshd_config Tue Sep 16 20:05:44 2003
--- sshd_config.orig Mon May 24 02:36:24 2004
+++ sshd_config Mon Sep 20 05:04:48 2004
@@ -34,6 +34,7 @@
#LoginGraceTime 2m
#PermitRootLogin yes
+PermitRootLogin no
#StrictModes yes
#MaxAuthTries 6
#RSAAuthentication yes
@@ -56,6 +57,7 @@
@@ -57,6 +58,7 @@
# Change to no to disable s/key passwords
#ChallengeResponseAuthentication yes