head	1.15;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.9
	OPENPKG_E1_MP:1.9
	OPENPKG_E1_MP_2_STABLE:1.7.2.1
	OPENPKG_E1_FP:1.7.2.1
	OPENPKG_2_STABLE_MP:1.10
	OPENPKG_2_STABLE_20061018:1.7.2.1
	OPENPKG_2_STABLE_20060622:1.7
	OPENPKG_2_STABLE:1.7.0.2
	OPENPKG_2_STABLE_BP:1.7
	OPENPKG_2_5_RELEASE:1.5
	OPENPKG_2_5_SOLID:1.5.0.2
	OPENPKG_2_5_SOLID_BP:1.5
	OPENPKG_2_4_RELEASE:1.4
	OPENPKG_2_4_SOLID:1.4.0.2
	OPENPKG_2_4_SOLID_BP:1.4
	OPENPKG_CW_FP:1.3
	OPENPKG_2_3_RELEASE:1.2
	OPENPKG_2_3_SOLID:1.2.0.4
	OPENPKG_2_3_SOLID_BP:1.2
	OPENPKG_2_2_RELEASE:1.2
	OPENPKG_2_2_SOLID:1.2.0.2
	OPENPKG_2_2_SOLID_BP:1.2
	OPENPKG_2_1_RELEASE:1.1
	OPENPKG_2_1_SOLID:1.1.0.2
	OPENPKG_2_1_SOLID_BP:1.1;
locks; strict;
comment	@# @;


1.15
date	2009.10.02.11.17.28;	author rse;	state Exp;
branches;
next	1.14;
commitid	Xk4IjVbjJ3Tu3X5u;

1.14
date	2009.02.25.11.30.07;	author rse;	state Exp;
branches;
next	1.13;
commitid	bjaokXKw9Z0haODt;

1.13
date	2008.07.22.06.40.10;	author rse;	state Exp;
branches;
next	1.12;
commitid	wzX0cmZIEkegzLbt;

1.12
date	2008.03.31.07.00.50;	author rse;	state Exp;
branches;
next	1.11;
commitid	AkgVggnP8MUxjfXs;

1.11
date	2007.09.05.06.48.40;	author rse;	state Exp;
branches;
next	1.10;
commitid	WXY9IaCSoN1TVvws;

1.10
date	2007.03.10.08.35.34;	author rse;	state Exp;
branches;
next	1.9;
commitid	jNQ0JCZue7Iihw9s;

1.9
date	2006.11.08.08.03.37;	author rse;	state Exp;
branches;
next	1.8;
commitid	rZGOJbUJEEXr1QTr;

1.8
date	2006.09.28.06.26.20;	author rse;	state Exp;
branches;
next	1.7;
commitid	ewMY8OERO6cONyOr;

1.7
date	2006.02.11.08.29.38;	author rse;	state Exp;
branches
	1.7.2.1;
next	1.6;
commitid	jPhEN94SBe8uQ8lr;

1.6
date	2006.02.01.18.49.18;	author rse;	state Exp;
branches;
next	1.5;
commitid	xrZO6IobC2NZAUjr;

1.5
date	2005.09.01.18.21.39;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	2005.05.29.08.10.06;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2005.03.12.06.54.54;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2004.08.17.18.01.27;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2004.03.12.11.39.56;	author rse;	state Exp;
branches;
next	;

1.7.2.1
date	2006.09.29.06.46.19;	author rse;	state Exp;
branches;
next	1.7.2.2;
commitid	VGQpsUXdDfQESGOr;

1.7.2.2
date	2006.11.08.08.58.49;	author rse;	state Exp;
branches;
next	1.7.2.3;
commitid	L8ZKn0WyVOQpkQTr;

1.7.2.3
date	2007.03.18.23.32.09;	author thl;	state Exp;
branches;
next	;
commitid	j886gsownDQWXCas;


desc
@@


1.15
log
@upgrading package: openssh 5.2p1 -> 5.3p1
@
text
@Index: auth1.c
--- auth1.c.orig	2009-03-08 01:40:28 +0100
+++ auth1.c	2009-10-02 13:10:17 +0200
@@@@ -40,6 +40,9 @@@@
 #endif
 #include "monitor_wrap.h"
 #include "buffer.h"
+#ifdef USE_ALIAS
+#include "match.h"
+#endif
 
 /* import */
 extern ServerOptions options;
@@@@ -384,6 +387,10 @@@@
 {
 	u_int ulen;
 	char *user, *style = NULL;
+#ifdef USE_ALIAS
+	int i, n;
+	char *cp;
+#endif
 
 	/* Get the name of the user that we wish to log in as. */
 	packet_read_expect(SSH_CMSG_USER);
@@@@ -395,6 +402,25 @@@@
 	if ((style = strchr(user, ':')) != NULL)
 		*style++ = '\0';
 
+#ifdef USE_ALIAS
+	for (i = 0; i < options.num_alias; i++) {
+		if (match_pattern_list(user, options.alias[i].alias, strlen(options.alias[i].alias), 0) == 1) {
+			if (style != NULL) {
+				n = strlen(options.alias[i].user) + 1 + strlen(style) + 1;
+				cp = xmalloc(n);
+				snprintf(cp, n, "%s:%s", options.alias[i].user, style);
+				style = strchr(cp, ':');
+				*style++ = '\0';
+			}
+			else
+				cp = xstrdup(options.alias[i].user);
+			xfree(user);
+			user = cp;
+			break;
+		}
+	}
+#endif
+
 	authctxt->user = user;
 	authctxt->style = style;
 
Index: auth2.c
--- auth2.c.orig	2009-06-22 08:11:07 +0200
+++ auth2.c	2009-10-02 13:10:17 +0200
@@@@ -49,6 +49,9 @@@@
 #include "dispatch.h"
 #include "pathnames.h"
 #include "buffer.h"
+#ifdef USE_ALIAS
+#include "match.h"
+#endif
 
 #ifdef GSSAPI
 #include "ssh-gss.h"
@@@@ -217,6 +220,10 @@@@
 	Authmethod *m = NULL;
 	char *user, *service, *method, *style = NULL;
 	int authenticated = 0;
+#ifdef USE_ALIAS
+	int i, n;
+	char *cp;
+#endif
 
 	if (authctxt == NULL)
 		fatal("input_userauth_request: no authctxt");
@@@@ -230,6 +237,25 @@@@
 	if ((style = strchr(user, ':')) != NULL)
 		*style++ = 0;
 
+#ifdef USE_ALIAS
+	for (i = 0; i < options.num_alias; i++) {
+		if (match_pattern_list(user, options.alias[i].alias, strlen(options.alias[i].alias), 0) == 1) {
+			if (style != NULL) {
+				n = strlen(options.alias[i].user) + 1 + strlen(style) + 1;
+				cp = xmalloc(n);
+				snprintf(cp, n, "%s:%s", options.alias[i].user, style);
+				style = strchr(cp, ':');
+				*style++ = '\0';
+			}
+			else
+				cp = xstrdup(options.alias[i].user);
+			xfree(user);
+			user = cp;
+			break;
+		}
+	}
+#endif
+
 	if (authctxt->attempt++ == 0) {
 		/* setup auth context */
 		authctxt->pw = PRIVSEP(getpwnamallow(user));
Index: servconf.c
--- servconf.c.orig	2009-06-21 12:26:17 +0200
+++ servconf.c	2009-10-02 13:10:17 +0200
@@@@ -128,6 +128,9 @@@@
 	options->adm_forced_command = NULL;
 	options->chroot_directory = NULL;
 	options->zero_knowledge_password_authentication = -1;
+#ifdef USE_ALIAS
+ 	options->num_alias = 0;
+#endif
 }
 
 void
@@@@ -306,6 +309,9 @@@@
 	sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
 	sUsePrivilegeSeparation, sAllowAgentForwarding,
 	sZeroKnowledgePasswordAuthentication,
+#ifdef USE_ALIAS
+	sAlias,
+#endif
 	sDeprecated, sUnsupported
 } ServerOpCodes;
 
@@@@ -424,6 +430,9 @@@@
 	{ "permitopen", sPermitOpen, SSHCFG_ALL },
 	{ "forcecommand", sForceCommand, SSHCFG_ALL },
 	{ "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
+#ifdef USE_ALIAS
+ 	{ "alias", sAlias },
+#endif
 	{ NULL, sBadOption, 0 }
 };
 
@@@@ -1301,6 +1310,26 @@@@
 		    arg = strdelim(&cp);
 		break;
 
+#ifdef USE_ALIAS
+	case sAlias:
+		if (options->num_alias >= MAX_ALIAS) {
+			fatal("%s line %d: too many user alias defined.",
+			    filename, linenum);
+		}
+		arg = strdelim(&cp);
+		if (arg == NULL || arg[0] == '\0')
+			fatal("%s line %d: missing user name alias(es).",
+			    filename, linenum);
+		options->alias[options->num_alias].alias = xstrdup(arg);
+		arg = strdelim(&cp);
+		if (arg == NULL || arg[0] == '\0')
+			fatal("%s line %d: missing user name to map alias '%s' to.",
+			    filename, linenum, options->alias[options->num_alias].alias);
+		options->alias[options->num_alias].user = xstrdup(arg);
+		options->num_alias++;
+		break;
+#endif
+
 	case sUnsupported:
 		logit("%s line %d: Unsupported option %s",
 		    filename, linenum, arg);
Index: servconf.h
--- servconf.h.orig	2009-01-28 06:31:23 +0100
+++ servconf.h	2009-10-02 13:10:17 +0200
@@@@ -151,6 +151,14 @@@@
 	int	num_permitted_opens;
 
 	char   *chroot_directory;
+#ifdef USE_ALIAS
+#define MAX_ALIAS 256
+	u_int num_alias;
+	struct {
+		char *alias;  /* the alias list to match */
+		char *user;   /* the username to map to */
+	} alias[MAX_ALIAS];
+#endif
 }       ServerOptions;
 
 void	 initialize_server_options(ServerOptions *);
Index: sshd_config.5
--- sshd_config.5.orig	2009-08-28 02:27:08 +0200
+++ sshd_config.5	2009-10-02 13:10:17 +0200
@@@@ -104,6 +104,15 @@@@
 Note that disabling agent forwarding does not improve security
 unless users are also denied shell access, as they can always install
 their own forwarders.
+.It Cm Alias
+Specifies an optional mapping of a list of user name aliases onto
+real user names.  The first argument is a comma separated list of
+user name aliases (optionally prefixed with '!' for negation) to
+match. The characters `*' and `?' can be used as wildcards in the
+alias patterns.  The second argument is the real user name onto
+which the aliases are mapped. This allows the use of appealing
+virtual login names (like `anonymous') instead of their physical
+counterparts (like `anoncvs').
 .It Cm AllowGroups
 This keyword can be followed by a list of group name patterns, separated
 by spaces.
@


1.14
log
@upgrading package: openssh 5.1p1 -> 5.2p1
@
text
@d2 2
a3 2
--- auth1.c.orig	2008-07-09 12:54:05 +0200
+++ auth1.c	2009-02-25 11:20:14 +0100
d14 1
a14 1
@@@@ -392,6 +395,10 @@@@
d25 1
a25 1
@@@@ -403,6 +410,25 @@@@
d52 2
a53 2
--- auth2.c.orig	2008-11-05 06:20:46 +0100
+++ auth2.c	2009-02-25 11:20:14 +0100
d102 2
a103 2
--- servconf.c.orig	2009-01-28 06:31:23 +0100
+++ servconf.c	2009-02-25 12:21:31 +0100
d163 1
a163 1
+++ servconf.h	2009-02-25 11:20:14 +0100
d180 2
a181 2
--- sshd_config.5.orig	2009-02-23 01:00:24 +0100
+++ sshd_config.5	2009-02-25 11:20:14 +0100
@


1.13
log
@upgrading package: openssh 5.0p1 -> 5.1p1
@
text
@d3 1
a3 1
+++ auth1.c	2008-07-22 08:31:42 +0200
d52 2
a53 2
--- auth2.c.orig	2008-07-05 01:44:53 +0200
+++ auth2.c	2008-07-22 08:31:42 +0200
d64 1
a64 1
@@@@ -211,6 +214,10 @@@@
d75 1
a75 1
@@@@ -224,6 +231,25 @@@@
d102 3
a104 4
--- servconf.c.orig	2008-07-04 05:51:12 +0200
+++ servconf.c	2008-07-22 08:32:07 +0200
@@@@ -127,6 +127,9 @@@@
 	options->num_permitted_opens = -1;
d107 1
d114 1
a114 2
@@@@ -302,6 +305,9 @@@@
 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
d117 1
d124 1
a124 1
@@@@ -415,6 +421,9 @@@@
d134 1
a134 1
@@@@ -1288,6 +1297,26 @@@@
d162 3
a164 3
--- servconf.h.orig	2008-06-10 15:01:51 +0200
+++ servconf.h	2008-07-22 08:31:42 +0200
@@@@ -149,6 +149,14 @@@@
d180 2
a181 2
--- sshd_config.5.orig	2008-07-02 14:35:43 +0200
+++ sshd_config.5	2008-07-22 08:32:30 +0200
@


1.12
log
@upgrading package: openssh 4.7p1 -> 4.9p1
@
text
@d2 3
a4 3
--- auth1.c.orig	2007-10-26 06:25:13 +0200
+++ auth1.c	2008-03-31 08:34:25 +0200
@@@@ -39,6 +39,9 @@@@
d14 1
a14 1
@@@@ -389,6 +392,10 @@@@
d25 1
a25 1
@@@@ -400,6 +407,25 @@@@
d52 3
a54 3
--- auth2.c.orig	2007-10-26 06:26:16 +0200
+++ auth2.c	2008-03-31 08:34:25 +0200
@@@@ -44,6 +44,9 @@@@
d64 1
a64 1
@@@@ -142,6 +145,10 @@@@
d75 1
a75 1
@@@@ -155,6 +162,25 @@@@
d102 3
a104 3
--- servconf.c.orig	2008-02-10 12:48:55 +0100
+++ servconf.c	2008-03-31 08:35:14 +0200
@@@@ -123,6 +123,9 @@@@
d114 1
a114 1
@@@@ -294,6 +297,9 @@@@
d117 1
a117 1
 	sUsePrivilegeSeparation,
d124 1
a124 1
@@@@ -405,6 +411,9 @@@@
d134 1
a134 1
@@@@ -1276,6 +1285,26 @@@@
d162 3
a164 3
--- servconf.h.orig	2008-03-07 08:31:24 +0100
+++ servconf.h	2008-03-31 08:34:49 +0200
@@@@ -146,6 +146,14 @@@@
d180 6
a185 6
--- sshd_config.5.orig	2008-03-27 01:02:02 +0100
+++ sshd_config.5	2008-03-31 08:34:25 +0200
@@@@ -95,6 +95,15 @@@@
 (use IPv6 only).
 The default is
 .Dq any .
@


1.11
log
@upgrading package: openssh 4.6p1 -> 4.7p1
@
text
@d2 2
a3 2
--- auth1.c.orig	2006-09-01 07:38:36 +0200
+++ auth1.c	2007-09-05 08:40:36 +0200
d52 2
a53 2
--- auth2.c.orig	2007-05-20 06:58:41 +0200
+++ auth2.c	2007-09-05 08:40:36 +0200
d64 1
a64 1
@@@@ -143,6 +146,10 @@@@
d75 1
a75 1
@@@@ -156,6 +163,25 @@@@
d102 3
a104 4
--- servconf.c.orig	2007-05-20 07:03:16 +0200
+++ servconf.c	2007-09-05 08:40:36 +0200
@@@@ -122,6 +122,9 @@@@
 	options->permit_tun = -1;
d107 1
d114 1
a114 1
@@@@ -293,6 +296,9 @@@@
d116 1
a116 1
 	sMatch, sPermitOpen, sForceCommand,
d124 1
a124 2
@@@@ -403,6 +409,9 @@@@
  	{ "match", sMatch, SSHCFG_ALL },
d127 1
d134 1
a134 1
@@@@ -1260,6 +1269,26 @@@@
d162 4
a165 4
--- servconf.h.orig	2007-02-19 12:25:38 +0100
+++ servconf.h	2007-09-05 08:40:36 +0200
@@@@ -141,6 +141,14 @@@@
 	int	permit_tun;
d167 1
a167 1
 	int	num_permitted_opens;
d180 2
a181 2
--- sshd_config.5.orig	2007-06-11 06:07:13 +0200
+++ sshd_config.5	2007-09-05 08:40:36 +0200
@


1.10
log
@upgrading package: openssh 4.5p1 -> 4.6p1
@
text
@d3 1
a3 1
+++ auth1.c	2007-03-10 09:30:55 +0100
d52 2
a53 2
--- auth2.c.orig	2007-03-01 11:31:29 +0100
+++ auth2.c	2007-03-10 09:30:55 +0100
d102 2
a103 2
--- servconf.c.orig	2007-03-01 11:31:29 +0100
+++ servconf.c	2007-03-10 09:30:55 +0100
d134 1
a134 1
@@@@ -1261,6 +1270,26 @@@@
d163 1
a163 1
+++ servconf.h	2007-03-10 09:30:55 +0100
d180 2
a181 2
--- sshd_config.5.orig	2007-03-06 11:21:18 +0100
+++ sshd_config.5	2007-03-10 09:30:55 +0100
@


1.9
log
@upgrading package: openssh 4.4p1 -> 4.5p1
@
text
@d3 1
a3 1
+++ auth1.c	2006-11-08 09:00:38 +0100
d52 2
a53 2
--- auth2.c.orig	2006-08-05 04:39:39 +0200
+++ auth2.c	2006-11-08 09:00:39 +0100
d64 1
a64 1
@@@@ -147,6 +150,10 @@@@
d75 1
a75 1
@@@@ -160,6 +167,25 @@@@
d102 2
a103 2
--- servconf.c.orig	2006-08-18 16:23:15 +0200
+++ servconf.c	2006-11-08 09:00:39 +0100
d134 1
a134 1
@@@@ -1260,6 +1269,26 @@@@
d162 2
a163 2
--- servconf.h.orig	2006-08-18 16:23:15 +0200
+++ servconf.h	2006-11-08 09:00:39 +0100
d180 3
a182 3
--- sshd_config.5.orig	2006-08-30 03:06:34 +0200
+++ sshd_config.5	2006-11-08 09:00:39 +0100
@@@@ -97,6 +97,15 @@@@
@


1.8
log
@upgrading package: openssh 4.3p2 -> 4.4p1
@
text
@d3 1
a3 1
+++ auth1.c	2006-09-28 08:00:58 +0200
d53 1
a53 1
+++ auth2.c	2006-09-28 08:00:58 +0200
d103 1
a103 1
+++ servconf.c	2006-09-28 08:01:48 +0200
d163 1
a163 1
+++ servconf.h	2006-09-28 08:02:15 +0200
d181 1
a181 1
+++ sshd_config.5	2006-09-28 08:00:58 +0200
@


1.7
log
@upgrading package: openssh 4.3p1 -> 4.3p2
@
text
@d2 4
a5 4
--- auth1.c.orig	2005-07-17 09:26:44 +0200
+++ auth1.c	2006-02-11 09:26:30 +0100
@@@@ -26,6 +26,9 @@@@
 #include "uidswap.h"
d14 1
a14 1
@@@@ -371,6 +374,10 @@@@
d25 1
a25 1
@@@@ -382,6 +389,25 @@@@
d52 4
a55 3
--- auth2.c.orig	2005-09-24 04:43:51 +0200
+++ auth2.c	2006-02-11 09:26:30 +0100
@@@@ -36,6 +36,9 @@@@
a56 1
 #include "monitor_wrap.h"
d64 1
a64 1
@@@@ -136,6 +139,10 @@@@
d75 1
a75 1
@@@@ -149,6 +156,25 @@@@
d102 3
a104 5
--- servconf.c.orig	2005-12-13 09:33:20 +0100
+++ servconf.c	2006-02-11 09:26:30 +0100
@@@@ -102,6 +102,9 @@@@
 	options->authorized_keys_file2 = NULL;
 	options->num_accept_env = 0;
d106 2
d111 1
d113 2
a114 4
 	/* Needs to be accessable in many places */
 	use_privsep = -1;
@@@@ -275,6 +278,9 @@@@
 	sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
d116 1
d124 4
a127 4
@@@@ -377,6 +383,9 @@@@
 	{ "useprivilegeseparation", sUsePrivilegeSeparation},
 	{ "acceptenv", sAcceptEnv },
 	{ "permittunnel", sPermitTunnel },
d131 1
a131 1
 	{ NULL, sBadOption }
d134 1
a134 1
@@@@ -995,6 +1004,26 @@@@
d162 4
a165 4
--- servconf.h.orig	2005-12-13 09:29:03 +0100
+++ servconf.h	2006-02-11 09:26:30 +0100
@@@@ -137,6 +137,14 @@@@
 	int	use_pam;		/* Enable auth via PAM */
d167 1
a167 1
 	int	permit_tun;
d180 3
a182 3
--- sshd_config.5.orig	2006-01-03 08:47:31 +0100
+++ sshd_config.5	2006-02-11 09:26:30 +0100
@@@@ -94,6 +94,15 @@@@
@


1.7.2.1
log
@MFC: security fixed version
@
text
@d2 4
a5 4
--- auth1.c.orig	2006-09-01 07:38:36 +0200
+++ auth1.c	2006-09-28 08:00:58 +0200
@@@@ -39,6 +39,9 @@@@
 #endif
d14 1
a14 1
@@@@ -389,6 +392,10 @@@@
d25 1
a25 1
@@@@ -400,6 +407,25 @@@@
d52 3
a54 4
--- auth2.c.orig	2006-08-05 04:39:39 +0200
+++ auth2.c	2006-09-28 08:00:58 +0200
@@@@ -44,6 +44,9 @@@@
 #include "dispatch.h"
d56 1
d64 1
a64 1
@@@@ -147,6 +150,10 @@@@
d75 1
a75 1
@@@@ -160,6 +167,25 @@@@
d102 5
a106 3
--- servconf.c.orig	2006-08-18 16:23:15 +0200
+++ servconf.c	2006-09-28 08:01:48 +0200
@@@@ -122,6 +122,9 @@@@
a107 2
 	options->num_permitted_opens = -1;
 	options->adm_forced_command = NULL;
a110 1
 }
d112 4
a115 2
 void
@@@@ -293,6 +296,9 @@@@
a116 1
 	sMatch, sPermitOpen, sForceCommand,
d124 4
a127 4
@@@@ -403,6 +409,9 @@@@
  	{ "match", sMatch, SSHCFG_ALL },
 	{ "permitopen", sPermitOpen, SSHCFG_ALL },
 	{ "forcecommand", sForceCommand, SSHCFG_ALL },
d131 1
a131 1
 	{ NULL, sBadOption, 0 }
d134 1
a134 1
@@@@ -1260,6 +1269,26 @@@@
d162 5
a166 3
--- servconf.h.orig	2006-08-18 16:23:15 +0200
+++ servconf.h	2006-09-28 08:02:15 +0200
@@@@ -141,6 +141,14 @@@@
a167 2
 
 	int	num_permitted_opens;
d180 3
a182 3
--- sshd_config.5.orig	2006-08-30 03:06:34 +0200
+++ sshd_config.5	2006-09-28 08:00:58 +0200
@@@@ -97,6 +97,15 @@@@
@


1.7.2.2
log
@MFC: security fixed version plus HPN patch related packaging fixes
@
text
@d3 1
a3 1
+++ auth1.c	2006-11-08 09:00:38 +0100
d53 1
a53 1
+++ auth2.c	2006-11-08 09:00:39 +0100
d103 1
a103 1
+++ servconf.c	2006-11-08 09:00:39 +0100
d163 1
a163 1
+++ servconf.h	2006-11-08 09:00:39 +0100
d181 1
a181 1
+++ sshd_config.5	2006-11-08 09:00:39 +0100
@


1.7.2.3
log
@MFC: make up leeway for 2_STABLE by virtue of build-time results
@
text
@d3 1
a3 1
+++ auth1.c	2007-03-10 09:30:55 +0100
d52 2
a53 2
--- auth2.c.orig	2007-03-01 11:31:29 +0100
+++ auth2.c	2007-03-10 09:30:55 +0100
d64 1
a64 1
@@@@ -143,6 +146,10 @@@@
d75 1
a75 1
@@@@ -156,6 +163,25 @@@@
d102 2
a103 2
--- servconf.c.orig	2007-03-01 11:31:29 +0100
+++ servconf.c	2007-03-10 09:30:55 +0100
d134 1
a134 1
@@@@ -1261,6 +1270,26 @@@@
d162 2
a163 2
--- servconf.h.orig	2007-02-19 12:25:38 +0100
+++ servconf.h	2007-03-10 09:30:55 +0100
d180 3
a182 3
--- sshd_config.5.orig	2007-03-06 11:21:18 +0100
+++ sshd_config.5	2007-03-10 09:30:55 +0100
@@@@ -95,6 +95,15 @@@@
@


1.6
log
@upgrading package: openssh 4.2p1 -> 4.3p1
@
text
@d3 1
a3 1
+++ auth1.c	2006-02-01 19:40:30 +0100
d53 1
a53 1
+++ auth2.c	2006-02-01 19:40:30 +0100
d103 1
a103 1
+++ servconf.c	2006-02-01 19:41:07 +0100
d163 1
a163 1
+++ servconf.h	2006-02-01 19:41:39 +0100
d181 1
a181 1
+++ sshd_config.5	2006-02-01 19:40:30 +0100
@


1.5
log
@upgrading package: openssh 4.1p1 -> 4.2p1
@
text
@d3 1
a3 1
+++ auth1.c	2005-09-01 20:05:23 +0200
d52 2
a53 2
--- auth2.c.orig	2005-07-17 09:26:44 +0200
+++ auth2.c	2005-09-01 20:05:23 +0200
d102 3
a104 4
--- servconf.c.orig	2005-08-12 14:11:37 +0200
+++ servconf.c	2005-09-01 20:05:23 +0200
@@@@ -101,6 +101,9 @@@@
 	options->authorized_keys_file = NULL;
d107 1
d114 1
a114 1
@@@@ -272,6 +275,9 @@@@
d116 1
a116 1
 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv,
d124 1
a124 2
@@@@ -373,6 +379,9 @@@@
 	{ "authorizedkeysfile2", sAuthorizedKeysFile2 },
d127 1
d134 1
a134 1
@@@@ -969,6 +978,26 @@@@
d162 3
a164 5
--- servconf.h.orig	2005-01-20 00:57:56 +0100
+++ servconf.h	2005-09-01 20:05:23 +0200
@@@@ -134,6 +134,14 @@@@
 	char   *authorized_keys_file;	/* File containing public keys */
 	char   *authorized_keys_file2;
d166 2
d180 2
a181 2
--- sshd_config.5.orig	2005-07-26 13:54:57 +0200
+++ sshd_config.5	2005-09-01 20:05:23 +0200
@


1.4
log
@upgrading package: openssh 4.0p1 -> 4.1p1
@
text
@d2 2
a3 2
--- auth1.c.orig	2005-02-08 11:52:48 +0100
+++ auth1.c	2005-05-29 10:03:31 +0200
d14 1
a14 1
@@@@ -309,6 +312,10 @@@@
d25 1
a25 1
@@@@ -320,6 +327,25 @@@@
d52 2
a53 2
--- auth2.c.orig	2005-02-08 11:52:48 +0100
+++ auth2.c	2005-05-29 10:03:31 +0200
d102 2
a103 2
--- servconf.c.orig	2005-03-14 13:08:12 +0100
+++ servconf.c	2005-05-29 10:03:31 +0200
d134 1
a134 1
@@@@ -943,6 +952,26 @@@@
d163 1
a163 1
+++ servconf.h	2005-05-29 10:03:31 +0200
d180 2
a181 2
--- sshd_config.5.orig	2005-03-31 13:33:51 +0200
+++ sshd_config.5	2005-05-29 10:03:31 +0200
@


1.3
log
@port all patches to the new OpenSSH 4.0 source code world order
@
text
@d3 1
a3 1
+++ auth1.c	2005-03-12 07:51:24 +0100
d53 1
a53 1
+++ auth2.c	2005-03-12 07:51:44 +0100
d102 2
a103 2
--- servconf.c.orig	2005-03-01 11:24:33 +0100
+++ servconf.c	2005-03-12 07:51:08 +0100
d163 1
a163 1
+++ servconf.h	2005-03-12 07:51:08 +0100
d180 2
a181 2
--- sshd_config.5.orig	2005-03-01 11:24:34 +0100
+++ sshd_config.5	2005-03-12 07:52:25 +0100
@


1.2
log
@upgrading package: openssh 3.8.1p1 -> 3.9p1
@
text
@d2 3
a4 4
--- auth1.c.orig	2004-08-12 14:40:25 +0200
+++ auth1.c	2004-08-17 19:49:39 +0200
@@@@ -25,6 +25,9 @@@@
 #include "session.h"
d7 1
d14 1
a14 1
@@@@ -284,6 +287,10 @@@@
d25 1
a25 1
@@@@ -295,6 +302,25 @@@@
d52 3
a54 4
--- auth2.c.orig	2004-08-12 14:40:25 +0200
+++ auth2.c	2004-08-17 19:49:39 +0200
@@@@ -35,6 +35,9 @@@@
 #include "dispatch.h"
d57 1
d64 1
a64 1
@@@@ -134,6 +137,10 @@@@
d75 1
a75 1
@@@@ -147,6 +154,25 @@@@
d102 3
a104 3
--- servconf.c.orig	2004-08-13 13:30:24 +0200
+++ servconf.c	2004-08-17 19:50:29 +0200
@@@@ -102,6 +102,9 @@@@
d124 1
a124 1
@@@@ -372,6 +378,9 @@@@
d134 1
a134 1
@@@@ -922,6 +931,26 @@@@
d162 3
a164 3
--- servconf.h.orig	2004-06-25 05:33:20 +0200
+++ servconf.h	2004-08-17 19:49:39 +0200
@@@@ -133,6 +133,14 @@@@
d180 6
a185 6
--- sshd_config.5.orig	2004-06-30 14:39:34 +0200
+++ sshd_config.5	2004-08-17 19:52:30 +0200
@@@@ -83,6 +83,15 @@@@
 user environments.
 For this reason, care should be taken in the use of this directive.
 The default is not to accept any environment variables.
@


1.1
log
@add Alias feature and cleanup ChRoot feature packaging
@
text
@a0 78
Index: servconf.c
--- servconf.c.orig	Fri Jan 23 12:03:10 2004
+++ servconf.c	Fri Mar 12 12:28:21 2004
@@@@ -101,6 +101,9 @@@@
 	options->client_alive_count_max = -1;
 	options->authorized_keys_file = NULL;
 	options->authorized_keys_file2 = NULL;
+#ifdef USE_ALIAS
+	options->num_alias = 0;
+#endif
 
 	/* Needs to be accessable in many places */
 	use_privsep = -1;
@@@@ -268,6 +271,9 @@@@
 	sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
 	sGssAuthentication, sGssCleanupCreds,
 	sUsePrivilegeSeparation,
+#ifdef USE_ALIAS
+	sAlias,
+#endif
 	sDeprecated, sUnsupported
 } ServerOpCodes;
 
@@@@ -366,6 +372,9 @@@@
 	{ "authorizedkeysfile", sAuthorizedKeysFile },
 	{ "authorizedkeysfile2", sAuthorizedKeysFile2 },
 	{ "useprivilegeseparation", sUsePrivilegeSeparation},
+#ifdef USE_ALIAS
+	{ "alias", sAlias },
+#endif
 	{ NULL, sBadOption }
 };
 
@@@@ -898,6 +907,26 @@@@
 		while (arg)
 		    arg = strdelim(&cp);
 		break;
+
+#ifdef USE_ALIAS
+	case sAlias:
+		if (options->num_alias >= MAX_ALIAS) {
+			fatal("%s line %d: too many user alias defined.",
+			    filename, linenum);
+		}
+		arg = strdelim(&cp);
+		if (arg == NULL || arg[0] == '\0')
+			fatal("%s line %d: missing user name alias(es).",
+			    filename, linenum);
+		options->alias[options->num_alias].alias = xstrdup(arg);
+		arg = strdelim(&cp);
+		if (arg == NULL || arg[0] == '\0')
+			fatal("%s line %d: missing user name to map alias '%s' to.",
+			    filename, linenum, options->alias[options->num_alias].alias);
+		options->alias[options->num_alias].user = xstrdup(arg);
+		options->num_alias++;
+		break;
+#endif
 
 	case sUnsupported:
 		logit("%s line %d: Unsupported option %s",
Index: servconf.h
--- servconf.h.orig	Wed Dec 31 01:37:34 2003
+++ servconf.h	Fri Mar 12 11:36:15 2004
@@@@ -125,6 +125,14 @@@@
 	char   *authorized_keys_file;	/* File containing public keys */
 	char   *authorized_keys_file2;
 	int	use_pam;		/* Enable auth via PAM */
+#ifdef USE_ALIAS
+#define MAX_ALIAS 256
+	u_int num_alias;
+	struct {
+		char *alias;  /* the alias list to match */
+		char *user;   /* the username to map to */
+	} alias[MAX_ALIAS];
+#endif
 }       ServerOptions;
 
 void	 initialize_server_options(ServerOptions *);
d2 3
a4 3
--- auth1.c.orig	Sat Nov 22 04:15:30 2003
+++ auth1.c	Fri Mar 12 12:30:48 2004
@@@@ -26,6 +26,9 @@@@
d14 1
a14 1
@@@@ -280,6 +283,10 @@@@
d25 1
a25 2
@@@@ -290,6 +297,25 @@@@
 
d28 1
a28 1
+
d47 1
a47 1
 
d50 1
d52 2
a53 2
--- auth2.c.orig	Mon Nov 17 11:13:41 2003
+++ auth2.c	Fri Mar 12 12:30:48 2004
d75 1
a75 2
@@@@ -146,6 +153,25 @@@@
 
d78 1
a78 1
+
d97 1
a97 1
 
d100 79
d180 6
a185 6
--- sshd_config.5.orig	Wed Feb 18 04:31:24 2004
+++ sshd_config.5	Fri Mar 12 11:44:55 2004
@@@@ -61,6 +61,16 @@@@
 keywords and their meanings are as follows (note that
 keywords are case-insensitive and arguments are case-sensitive):
 .Bl -tag -width Ds
a194 1
+.Pp
@