View | Details | Raw Unified | Return to bug 1739 | Differences between
and this patch

Collapse All | Expand All

(-)openssh-5.4p1/servconf.c.orig (-1 / +12 lines)
Lines 1223-1229 Link Here
1223
		charptr = (opcode == sAuthorizedKeysFile) ?
1252
		charptr = (opcode == sAuthorizedKeysFile) ?
1224
		    &options->authorized_keys_file :
1253
		    &options->authorized_keys_file :
1225
		    &options->authorized_keys_file2;
1254
		    &options->authorized_keys_file2;
1226
		goto parse_filename;
1255
1256
		arg = strdelim(&cp);
1257
		if (!arg || *arg == '\0')
1258
			fatal("%s line %d: missing file name.",
1259
			    filename, linenum);
1260
		if (*activep && *charptr == NULL) {
1261
			*charptr = xstrdup(arg);
1262
			/* increase optional counter */
1263
			if (intptr != NULL)
1264
				*intptr = *intptr + 1;
1265
		}
1266
		break;
1227
1267
1228
	case sClientAliveInterval:
1268
	case sClientAliveInterval:
1229
		intptr = &options->client_alive_interval;
1269
		intptr = &options->client_alive_interval;

Return to bug 1739