Patch Name: heimdal-1.0.1-fhs-compliance-1.patch Submitted By: Randy McMurchy Date: 2007-08-26 Initial Package Version: 1.0.1 (this patch adapted from an 0.7.2 version patch) Upstream Status: N/A (LFS specific) Origin: Randy McMurchy Description: Changes all references of /var/heimdal to /var/lib/heimdal in source code and documentation to comply with the FHS --- heimdal-1.0.1/doc/heimdal.info~ 2007-08-09 10:51:03.000000000 +0300 +++ heimdal-1.0.1/doc/heimdal.info 2007-08-26 13:01:59.000000000 +0300 @@ -513,15 +513,15 @@ ========================= The database library will look for the database in the directory -`/var/heimdal', so you should probably create that directory. Make +`/var/lib/heimdal', so you should probably create that directory. Make sure the directory has restrictive permissions. - # mkdir /var/heimdal + # mkdir /var/lib/heimdal The keys of all the principals are stored in the database. If you choose to, these can be encrypted with a master key. You do not have to remember this key (or password), but just to enter it once and it will -be stored in a file (`/var/heimdal/m-key'). If you want to have a +be stored in a file (`/var/lib/heimdal/m-key'). If you want to have a master key, run `kstash' to create this master key: # kstash @@ -756,7 +756,7 @@ `749/tcp'. Access to the administration server is controlled by an ACL file, -(default `/var/heimdal/kadmind.acl'.) The file has the following syntax: +(default `/var/lib/heimdal/kadmind.acl'.) The file has the following syntax: principal [priv1,priv2,...] [glob-pattern] The matching is from top to bottom for matching principals (and if @@ -907,7 +907,7 @@ follows: slave# ktutil get -p foo/admin hprop/`hostname` - slave# mkdir /var/heimdal + slave# mkdir /var/lib/heimdal slave# hpropd The master will use the principal `kadmin/hprop' to authenticate to the @@ -955,7 +955,7 @@ The program that runs on the master is `ipropd-master' and all clients run `ipropd-slave'. -Create the file `/var/heimdal/slaves' on the master containing all the +Create the file `/var/lib/heimdal/slaves' on the master containing all the slaves that the database should be propagated to. Each line contains the full name of the principal (for example `iprop/hemligare.foo.se@FOO.SE'). @@ -973,7 +973,7 @@ The next step is to start the `ipropd-master' process on the master server. The `ipropd-master' listens on the UNIX domain socket -`/var/heimdal/signal' to know when changes have been made to the +`/var/lib/heimdal/signal' to know when changes have been made to the database so they can be propagated to the slaves. There is also a safety feature of testing the version number regularly (every 30 seconds) to see if it has been modified by some means that do not raise --- heimdal-1.0.1/doc/setup.texi~ 2007-08-09 10:47:03.000000000 +0300 +++ heimdal-1.0.1/doc/setup.texi 2007-08-26 13:03:47.000000000 +0300 @@ -107,17 +107,17 @@ @section Creating the database The database library will look for the database in the directory -@file{/var/heimdal}, so you should probably create that directory. +@file{/var/lib/heimdal}, so you should probably create that directory. Make sure the directory has restrictive permissions. @example -# mkdir /var/heimdal +# mkdir /var/lib/heimdal @end example The keys of all the principals are stored in the database. If you choose to, these can be encrypted with a master key. You do not have to remember this key (or password), but just to enter it once and it will -be stored in a file (@file{/var/heimdal/m-key}). If you want to have a +be stored in a file (@file{/var/lib/heimdal/m-key}). If you want to have a master key, run @samp{kstash} to create this master key: @example @@ -361,7 +361,7 @@ as @samp{749/tcp}. Access to the administration server is controlled by an ACL file, -(default @file{/var/heimdal/kadmind.acl}.) The file has the following +(default @file{/var/lib/heimdal/kadmind.acl}.) The file has the following syntax: @smallexample principal [priv1,priv2,...] [glob-pattern] @@ -525,7 +525,7 @@ @example slave# ktutil get -p foo/admin hprop/`hostname` -slave# mkdir /var/heimdal +slave# mkdir /var/lib/heimdal slave# hpropd @end example @@ -577,7 +577,7 @@ The program that runs on the master is @command{ipropd-master} and all clients run @command{ipropd-slave}. -Create the file @file{/var/heimdal/slaves} on the master containing all +Create the file @file{/var/lib/heimdal/slaves} on the master containing all the slaves that the database should be propagated to. Each line contains the full name of the principal (for example @samp{iprop/hemligare.foo.se@@FOO.SE}). @@ -598,7 +598,7 @@ The next step is to start the @command{ipropd-master} process on the master server. The @command{ipropd-master} listens on the UNIX domain socket -@file{/var/heimdal/signal} to know when changes have been made to the +@file{/var/lib/heimdal/signal} to know when changes have been made to the database so they can be propagated to the slaves. There is also a safety feature of testing the version number regularly (every 30 seconds) to see if it has been modified by some means that do not raise --- heimdal-1.0.1/kdc/kstash.8~ 2007-08-09 10:47:23.000000000 +0300 +++ heimdal-1.0.1/kdc/kstash.8 2007-08-26 13:05:20.000000000 +0300 @@ -89,7 +89,7 @@ .El .\".Sh ENVIRONMENT .Sh FILES -.Pa /var/heimdal/m-key +.Pa /var/lib/heimdal/m-key is the default keyfile if no other keyfile is specified. The format of a Heimdal master key is the same as a keytab, so .Nm ktutil --- heimdal-1.0.1/lib/hdb/hdb.h~ 2007-08-09 10:47:05.000000000 +0300 +++ heimdal-1.0.1/lib/hdb/hdb.h 2007-08-26 12:52:52.000000000 +0300 @@ -135,7 +135,7 @@ krb5_error_code (*create)(krb5_context, HDB **, const char *filename); }; -#define HDB_DB_DIR "/var/heimdal" +#define HDB_DB_DIR "/var/lib/heimdal" #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal" #define HDB_DB_FORMAT_ENTRY "hdb/db-format" --- heimdal-1.0.1/lib/krb5/krb5.conf.5~ 2007-08-09 10:47:13.000000000 +0300 +++ heimdal-1.0.1/lib/krb5/krb5.conf.5 2007-08-26 12:52:52.000000000 +0300 @@ -504,7 +504,7 @@ default_domain = foo.se } [logging] - kdc = FILE:/var/heimdal/kdc.log + kdc = FILE:/var/lib/heimdal/kdc.log kdc = SYSLOG:INFO default = SYSLOG:INFO:USER .Ed --- heimdal-1.0.1/lib/krb5/krb5.conf.cat5~ 2007-08-09 10:50:38.000000000 +0300 +++ heimdal-1.0.1/lib/krb5/krb5.conf.cat5 2007-08-26 12:52:52.000000000 +0300 @@ -517,7 +517,7 @@ default_domain = foo.se } [logging] - kdc = FILE:/var/heimdal/kdc.log + kdc = FILE:/var/lib/heimdal/kdc.log kdc = SYSLOG:INFO default = SYSLOG:INFO:USER --- heimdal-1.0.1/configure~ 2007-08-09 10:48:00.000000000 +0300 +++ heimdal-1.0.1/configure 2007-08-26 12:52:52.000000000 +0300 @@ -3998,7 +3998,7 @@ test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' -test "$localstatedir" = '${prefix}/var' && localstatedir='/var/heimdal' +test "$localstatedir" = '${prefix}/var' && localstatedir='/var/lib/heimdal' # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || --- heimdal-1.0.1/configure.in~ 2007-08-09 10:47:23.000000000 +0300 +++ heimdal-1.0.1/configure.in 2007-08-26 12:52:52.000000000 +0300 @@ -17,7 +17,7 @@ AC_PREFIX_DEFAULT(/usr/heimdal) test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc' -test "$localstatedir" = '${prefix}/var' && localstatedir='/var/heimdal' +test "$localstatedir" = '${prefix}/var' && localstatedir='/var/lib/heimdal' AC_CANONICAL_HOST CANONICAL_HOST=$host