Attachment 2138 Details for Bug 983 – fixes of original patch

[patch] fixes of original patch

fix-original.patch (text/plain), 2.15 KB, created by Petr Lautrbach on 2012-03-28 02:35:54 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Lautrbach

Created: 2012-03-28 02:35:54 AEDT

Size: 2.15 KB

patch

obsolete

>diff --git a/auth2.c b/auth2.c
>index 77e57ab..dfa40a8 100644
>--- a/auth2.c
>+++ b/auth2.c
>@@ -482,7 +482,7 @@ auth2_check_required(const char *list)
> 			ret = -1;
> 		}
> 		/* Activate method if it isn't already */
>-		if (*(m->enabled) == -1)
>+		if (m->enabled != NULL && *(m->enabled) == -1)
> 			*(m->enabled) = 1;
> 	}
> 	xfree(orig_methods);
>diff --git a/monitor.c b/monitor.c
>index 31cdba3..62f9c9f 100644
>--- a/monitor.c
>+++ b/monitor.c
>@@ -415,9 +415,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
> 				    auth_method, *req_auth);
> 			debug2("monitor_child_preauth: required list now: %s",
> 			    *req_auth == NULL ? "DONE" : *req_auth);
>-			if (*req_auth != NULL)
>+			if (*req_auth != NULL) {
> 				authenticated = 0;
>-			no_increment = 1;
>+				no_increment = 1;
>+			}
> 		}
> 
> 		if (ent->flags & (MON_AUTHDECIDE|MON_ALOG)) {
>diff --git a/servconf.c b/servconf.c
>index 9f24394..112aaee 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -1231,12 +1231,12 @@ process_server_config_line(ServerOptions *options, char *line,
> 	case sRequiredAuthentications1:
> 		charptr = &options->required_auth1;
> 		arg = strdelim(&cp);
>-		if (auth1_check_required(arg) != 0)
>-			fatal("%.200s line %d: Invalid required authentication "
>-			    "list", filename, linenum);
> 		if (!arg || *arg == '\0')
> 			fatal("%.200s line %d: Missing argument.",
> 			    filename, linenum);
>+		if (auth1_check_required(arg) != 0)
>+			fatal("%.200s line %d: Invalid required authentication "
>+			    "list", filename, linenum);
> 		if (*charptr == NULL)
> 			*charptr = xstrdup(arg);
> 		break;
>@@ -1244,12 +1244,12 @@ process_server_config_line(ServerOptions *options, char *line,
> 	case sRequiredAuthentications2:
> 		charptr = &options->required_auth2;
> 		arg = strdelim(&cp);
>-		if (auth2_check_required(arg) != 0)
>-			fatal("%.200s line %d: Invalid required authentication "
>-			    "list", filename, linenum);
> 		if (!arg || *arg == '\0')
> 			fatal("%.200s line %d: Missing argument.",
> 			    filename, linenum);
>+		if (auth2_check_required(arg) != 0)
>+			fatal("%.200s line %d: Invalid required authentication "
>+			    "list", filename, linenum);
> 		if (*charptr == NULL)
> 			*charptr = xstrdup(arg);
> 		break;

Actions: View | Diff

Attachments on bug 983: 807 | 941 | 1121 | 1122 | 1123 | 1455 | 1518 | 1521 | 1567 | 1667 | 1768 | 1955 | 1999 | 2079 | 2084 | 2096 | 2138 | 2177 | 2178 | 2192 | 2196