tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2006/12/13 08:34:39 

[servconf.c]
     Make PermitOpen work with multiple values like the man pages says.
     bz #1267 with details from peter at dmtz.com, with & ok djm@
This commit is contained in:
Damien Miller 2007-01-05 16:28:36 +11:00
parent 1ec462658e
commit a29b95ec3a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -17,6 +17,10 @@
them an address for cases where they are not explicitly them an address for cases where they are not explicitly
specified (wildcard or localhost bind). reported by daveroth AT specified (wildcard or localhost bind). reported by daveroth AT
acm.org; ok dtucker@ deraadt@ acm.org; ok dtucker@ deraadt@
- dtucker@cvs.openbsd.org 2006/12/13 08:34:39
[servconf.c]
Make PermitOpen work with multiple values like the man pages says.
bz #1267 with details from peter at dmtz.com, with & ok djm@
20061205 20061205
- (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would
@ -2637,4 +2641,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4595 2007/01/05 05:26:45 djm Exp $ $Id: ChangeLog,v 1.4596 2007/01/05 05:28:36 djm Exp $

9
servconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.c,v 1.165 2006/08/14 12:40:25 dtucker Exp $ */ /* $OpenBSD: servconf.c,v 1.166 2006/12/13 08:34:39 dtucker Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1227,6 +1227,9 @@ parse_flag:
} }
break; break;
} }
n = options->num_permitted_opens; /* modified later */
if (*activep && n == -1)
channel_clear_adm_permitted_opens();
for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) { for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) {
p = hpdelim(&arg); p = hpdelim(&arg);
if (p == NULL) if (p == NULL)
@ -1236,11 +1239,9 @@ parse_flag:
if (arg == NULL || (port = a2port(arg)) == 0) if (arg == NULL || (port = a2port(arg)) == 0)
fatal("%s line %d: bad port number in " fatal("%s line %d: bad port number in "
"PermitOpen", filename, linenum); "PermitOpen", filename, linenum);
if (*activep && options->num_permitted_opens == -1) { if (*activep && n == -1)
channel_clear_adm_permitted_opens();
options->num_permitted_opens = options->num_permitted_opens =
channel_add_adm_permitted_opens(p, port); channel_add_adm_permitted_opens(p, port);
}
} }
break; break;