blob: e6e22e865da67aad933b8e1129ce665af9c8fc28 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.1p1+lpk/servconf.c openssh-5.1p1+lpk+glue/servconf.c
--- openssh-5.1p1+lpk/servconf.c 2008-08-23 14:37:18.000000000 -0700
+++ openssh-5.1p1+lpk+glue/servconf.c 2008-08-23 14:52:19.000000000 -0700
@@ -111,6 +111,25 @@
options->num_allow_groups = 0;
options->num_deny_groups = 0;
options->ciphers = NULL;
+#ifdef WITH_LDAP_PUBKEY
+ /* XXX dirty */
+ options->lpk.ld = NULL;
+ options->lpk.on = -1;
+ options->lpk.servers = NULL;
+ options->lpk.u_basedn = NULL;
+ options->lpk.g_basedn = NULL;
+ options->lpk.binddn = NULL;
+ options->lpk.bindpw = NULL;
+ options->lpk.sgroup = NULL;
+ options->lpk.filter = NULL;
+ options->lpk.fgroup = NULL;
+ options->lpk.l_conf = NULL;
+ options->lpk.tls = -1;
+ options->lpk.b_timeout.tv_sec = -1;
+ options->lpk.s_timeout.tv_sec = -1;
+ options->lpk.flags = FLAG_EMPTY;
+#endif
+
options->macs = NULL;
options->protocol = SSH_PROTO_UNKNOWN;
options->gateway_ports = -1;
@@ -131,25 +150,6 @@
options->num_permitted_opens = -1;
options->adm_forced_command = NULL;
options->chroot_directory = NULL;
-#ifdef WITH_LDAP_PUBKEY
- /* XXX dirty */
- options->lpk.ld = NULL;
- options->lpk.on = -1;
- options->lpk.servers = NULL;
- options->lpk.u_basedn = NULL;
- options->lpk.g_basedn = NULL;
- options->lpk.binddn = NULL;
- options->lpk.bindpw = NULL;
- options->lpk.sgroup = NULL;
- options->lpk.filter = NULL;
- options->lpk.fgroup = NULL;
- options->lpk.l_conf = NULL;
- options->lpk.tls = -1;
- options->lpk.b_timeout.tv_sec = -1;
- options->lpk.s_timeout.tv_sec = -1;
- options->lpk.flags = FLAG_EMPTY;
-#endif
-
}
void
|
GitWeb
