equal
deleted
inserted
replaced
5 # Note: It is not intended that these changes are to be contributed to MIT as |
5 # Note: It is not intended that these changes are to be contributed to MIT as |
6 # MIT will be modifying the way the KDC path is handled here in a future |
6 # MIT will be modifying the way the KDC path is handled here in a future |
7 # update. |
7 # update. |
8 # Patch source: in-house |
8 # Patch source: in-house |
9 # |
9 # |
10 diff --git a/src/man/kadm5.acl.man b/src/man/kadm5.acl.man |
|
11 --- a/src/man/kadm5.acl.man |
10 --- a/src/man/kadm5.acl.man |
12 +++ b/src/man/kadm5.acl.man |
11 +++ b/src/man/kadm5.acl.man |
13 @@ -38,7 +38,7 @@ For operations that affect principals, the ACL file also controls |
12 @@ -38,7 +38,7 @@ For operations that affect principals, the ACL file also controls |
14 which principals can operate on which other principals. |
13 which principals can operate on which other principals. |
15 .sp |
14 .sp |
17 -\fB@LOCALSTATEDIR@\fP\fB/krb5kdc\fP\fB/kadm5.acl\fP unless this is overridden by the \fIacl_file\fP |
16 -\fB@LOCALSTATEDIR@\fP\fB/krb5kdc\fP\fB/kadm5.acl\fP unless this is overridden by the \fIacl_file\fP |
18 +\fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/kadm5.acl\fP unless this is overridden by the \fIacl_file\fP |
17 +\fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/kadm5.acl\fP unless this is overridden by the \fIacl_file\fP |
19 variable in \fIkdc.conf(5)\fP\&. |
18 variable in \fIkdc.conf(5)\fP\&. |
20 .SH SYNTAX |
19 .SH SYNTAX |
21 .sp |
20 .sp |
22 diff --git a/src/man/kadmind.man b/src/man/kadmind.man |
|
23 --- a/src/man/kadmind.man |
21 --- a/src/man/kadmind.man |
24 +++ b/src/man/kadmind.man |
22 +++ b/src/man/kadmind.man |
25 @@ -67,7 +67,7 @@ settings. |
23 @@ -67,7 +67,7 @@ settings. |
26 kadmind\(aqs ACL (access control list) tells it which principals are |
24 kadmind\(aqs ACL (access control list) tells it which principals are |
27 allowed to perform administration actions. The pathname to the |
25 allowed to perform administration actions. The pathname to the |
29 -variable; by default, it is \fB@LOCALSTATEDIR@\fP\fB/krb5kdc\fP\fB/kadm5.acl\fP\&. |
27 -variable; by default, it is \fB@LOCALSTATEDIR@\fP\fB/krb5kdc\fP\fB/kadm5.acl\fP\&. |
30 +variable; by default, it is \fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/kadm5.acl\fP\&. |
28 +variable; by default, it is \fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/kadm5.acl\fP\&. |
31 .UNINDENT |
29 .UNINDENT |
32 .sp |
30 .sp |
33 After the server begins running, it puts itself in the background and |
31 After the server begins running, it puts itself in the background and |
34 diff --git a/src/man/kdb5_ldap_util.man b/src/man/kdb5_ldap_util.man |
|
35 --- a/src/man/kdb5_ldap_util.man |
32 --- a/src/man/kdb5_ldap_util.man |
36 +++ b/src/man/kdb5_ldap_util.man |
33 +++ b/src/man/kdb5_ldap_util.man |
37 @@ -325,7 +325,7 @@ to the LDAP server. Options: |
34 @@ -325,7 +325,7 @@ to the LDAP server. Options: |
38 .TP |
35 .TP |
39 .B \fB\-f\fP \fIfilename\fP |
36 .B \fB\-f\fP \fIfilename\fP |
41 -default, \fB/usr/local/var/service_passwd\fP is used. |
38 -default, \fB/usr/local/var/service_passwd\fP is used. |
42 +default, \fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/service_passwd\fP is used. |
39 +default, \fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/service_passwd\fP is used. |
43 .TP |
40 .TP |
44 .B \fIname\fP |
41 .B \fIname\fP |
45 Specifies the name of the object whose password is to be stored. |
42 Specifies the name of the object whose password is to be stored. |
46 diff --git a/src/man/kdc.conf.man b/src/man/kdc.conf.man |
|
47 --- a/src/man/kdc.conf.man |
43 --- a/src/man/kdc.conf.man |
48 +++ b/src/man/kdc.conf.man |
44 +++ b/src/man/kdc.conf.man |
49 @@ -39,7 +39,7 @@ KDC programs mentioned, krb5.conf and kdc.conf will be merged into a |
45 @@ -39,7 +39,7 @@ KDC programs mentioned, krb5.conf and kdc.conf will be merged into a |
50 single configuration profile. |
46 single configuration profile. |
51 .sp |
47 .sp |
142 -\fB@LOCALSTATEDIR@\fP\fB/krb5kdc\fP\fB/kdc.conf\fP |
138 -\fB@LOCALSTATEDIR@\fP\fB/krb5kdc\fP\fB/kdc.conf\fP |
143 +\fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/kdc.conf\fP |
139 +\fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/kdc.conf\fP |
144 .SH SEE ALSO |
140 .SH SEE ALSO |
145 .sp |
141 .sp |
146 \fIkrb5.conf(5)\fP, \fIkrb5kdc(8)\fP, \fIkadm5.acl(5)\fP |
142 \fIkrb5.conf(5)\fP, \fIkrb5kdc(8)\fP, \fIkadm5.acl(5)\fP |
147 diff --git a/src/man/kprop.man b/src/man/kprop.man |
|
148 --- a/src/man/kprop.man |
143 --- a/src/man/kprop.man |
149 +++ b/src/man/kprop.man |
144 +++ b/src/man/kprop.man |
150 @@ -54,7 +54,7 @@ Specifies the realm of the master server. |
145 @@ -54,7 +54,7 @@ Specifies the realm of the master server. |
151 .B \fB\-f\fP \fIfile\fP |
146 .B \fB\-f\fP \fIfile\fP |
152 Specifies the filename where the dumped principal database file is |
147 Specifies the filename where the dumped principal database file is |
154 -\fB@LOCALSTATEDIR@\fP\fB/krb5kdc\fP\fB/slave_datatrans\fP\&. |
149 -\fB@LOCALSTATEDIR@\fP\fB/krb5kdc\fP\fB/slave_datatrans\fP\&. |
155 +\fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/slave_datatrans\fP\&. |
150 +\fB@LOCALSTATEDIR@\fP\fB/krb5\fP\fB/slave_datatrans\fP\&. |
156 .TP |
151 .TP |
157 .B \fB\-P\fP \fIport\fP |
152 .B \fB\-P\fP \fIport\fP |
158 Specifies the port to use to contact the \fIkpropd(8)\fP server |
153 Specifies the port to use to contact the \fIkpropd(8)\fP server |
159 diff --git a/src/man/kpropd.man b/src/man/kpropd.man |
|
160 --- a/src/man/kpropd.man |
154 --- a/src/man/kpropd.man |
161 +++ b/src/man/kpropd.man |
155 +++ b/src/man/kpropd.man |
162 @@ -106,7 +106,7 @@ default, the master admin server is contacted. |
156 @@ -106,7 +106,7 @@ default, the master admin server is contacted. |
163 .TP |
157 .TP |
164 .B \fB\-f\fP \fIfile\fP |
158 .B \fB\-f\fP \fIfile\fP |