diff options
| -rw-r--r-- | etc/defaults/rc.conf | 15 | ||||
| -rw-r--r-- | etc/network.subr | 35 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 35 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 35 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 35 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 35 | ||||
| -rw-r--r-- | etc/rc.d/routing | 35 | ||||
| -rw-r--r-- | etc/rc.network | 35 |
8 files changed, 194 insertions, 66 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 68dd437..e30ffd2 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -124,10 +124,19 @@ named_program="named" # path to named, if you want a different one. named_flags="" # Flags for named #named_flags="-u bind -g bind" # Flags for named -kerberos_server_enable="NO" # Run a kerberos master server (or NO). -kadmind_server_enable="NO" # Run kadmind (or NO) -- do not run on - # a slave kerberos server +# +# kerberos. Do not run the admin daemons on slave servers +# +kerberos4_server_enable="NO" # Run a kerberos IV master server (or NO). +kerberos4_server="/usr/sbin/kerberos" # path to kerberos IV KDC +kadmind4_server_enable="NO" # Run kadmind (or NO) +kadmind4_server="/usr/sbin/kadmind" # path to kerberos IV admin daemon +kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). +kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC +kadmind5_server_enable="NO" # Run kadmind (or NO) +kadmind5_server="/usr/libexec/k5admind" # path to kerberos 5 admin daemon kerberos_stash="" # Is the kerberos master key stashed? + rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). diff --git a/etc/network.subr b/etc/network.subr index 413dc4f..86db5ea 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -686,31 +686,48 @@ network_pass3() { ;; esac - # Kerberos runs ONLY on the Kerberos server machine - case ${kerberos_server_enable} in + # Kerberos servers run ONLY on the Kerberos server machine + case ${kerberos4_server_enable} in [Yy][Ee][Ss]) case ${kerberos_stash} in [Yy][Ee][Ss]) - stash_flag=-n + stash=-n ;; *) - stash_flag= + stash= ;; esac - echo -n ' kerberos' - kerberos ${stash_flag} >> /var/log/kerberos.log & + echo -n ' kerberosIV' + ${kerberos4_server} ${stash} >> /var/log/kerberos.log & - case ${kadmind_server_enable} in + case ${kadmind4_server_enable} in [Yy][Ee][Ss]) - echo -n ' kadmind' - (sleep 20; kadmind ${stash_flag} >/dev/null 2>&1 &) & + echo -n ' kadmindIV' + ( + sleep 20; + ${kadmind4_server} ${stash} >/dev/null 2>&1 & + ) & ;; esac unset stash_flag ;; esac + case ${kerberos5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kerberos5' + ${kerberos5_server} & + + case ${kadmind5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kadmind5' + ${kadmind5_server} & + ;; + esac + ;; + esac + case ${pppoed_enable} in [Yy][Ee][Ss]) if [ -n "${pppoed_provider}" ]; then diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 413dc4f..86db5ea 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -686,31 +686,48 @@ network_pass3() { ;; esac - # Kerberos runs ONLY on the Kerberos server machine - case ${kerberos_server_enable} in + # Kerberos servers run ONLY on the Kerberos server machine + case ${kerberos4_server_enable} in [Yy][Ee][Ss]) case ${kerberos_stash} in [Yy][Ee][Ss]) - stash_flag=-n + stash=-n ;; *) - stash_flag= + stash= ;; esac - echo -n ' kerberos' - kerberos ${stash_flag} >> /var/log/kerberos.log & + echo -n ' kerberosIV' + ${kerberos4_server} ${stash} >> /var/log/kerberos.log & - case ${kadmind_server_enable} in + case ${kadmind4_server_enable} in [Yy][Ee][Ss]) - echo -n ' kadmind' - (sleep 20; kadmind ${stash_flag} >/dev/null 2>&1 &) & + echo -n ' kadmindIV' + ( + sleep 20; + ${kadmind4_server} ${stash} >/dev/null 2>&1 & + ) & ;; esac unset stash_flag ;; esac + case ${kerberos5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kerberos5' + ${kerberos5_server} & + + case ${kadmind5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kadmind5' + ${kadmind5_server} & + ;; + esac + ;; + esac + case ${pppoed_enable} in [Yy][Ee][Ss]) if [ -n "${pppoed_provider}" ]; then diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 413dc4f..86db5ea 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -686,31 +686,48 @@ network_pass3() { ;; esac - # Kerberos runs ONLY on the Kerberos server machine - case ${kerberos_server_enable} in + # Kerberos servers run ONLY on the Kerberos server machine + case ${kerberos4_server_enable} in [Yy][Ee][Ss]) case ${kerberos_stash} in [Yy][Ee][Ss]) - stash_flag=-n + stash=-n ;; *) - stash_flag= + stash= ;; esac - echo -n ' kerberos' - kerberos ${stash_flag} >> /var/log/kerberos.log & + echo -n ' kerberosIV' + ${kerberos4_server} ${stash} >> /var/log/kerberos.log & - case ${kadmind_server_enable} in + case ${kadmind4_server_enable} in [Yy][Ee][Ss]) - echo -n ' kadmind' - (sleep 20; kadmind ${stash_flag} >/dev/null 2>&1 &) & + echo -n ' kadmindIV' + ( + sleep 20; + ${kadmind4_server} ${stash} >/dev/null 2>&1 & + ) & ;; esac unset stash_flag ;; esac + case ${kerberos5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kerberos5' + ${kerberos5_server} & + + case ${kadmind5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kadmind5' + ${kadmind5_server} & + ;; + esac + ;; + esac + case ${pppoed_enable} in [Yy][Ee][Ss]) if [ -n "${pppoed_provider}" ]; then diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 413dc4f..86db5ea 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -686,31 +686,48 @@ network_pass3() { ;; esac - # Kerberos runs ONLY on the Kerberos server machine - case ${kerberos_server_enable} in + # Kerberos servers run ONLY on the Kerberos server machine + case ${kerberos4_server_enable} in [Yy][Ee][Ss]) case ${kerberos_stash} in [Yy][Ee][Ss]) - stash_flag=-n + stash=-n ;; *) - stash_flag= + stash= ;; esac - echo -n ' kerberos' - kerberos ${stash_flag} >> /var/log/kerberos.log & + echo -n ' kerberosIV' + ${kerberos4_server} ${stash} >> /var/log/kerberos.log & - case ${kadmind_server_enable} in + case ${kadmind4_server_enable} in [Yy][Ee][Ss]) - echo -n ' kadmind' - (sleep 20; kadmind ${stash_flag} >/dev/null 2>&1 &) & + echo -n ' kadmindIV' + ( + sleep 20; + ${kadmind4_server} ${stash} >/dev/null 2>&1 & + ) & ;; esac unset stash_flag ;; esac + case ${kerberos5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kerberos5' + ${kerberos5_server} & + + case ${kadmind5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kadmind5' + ${kadmind5_server} & + ;; + esac + ;; + esac + case ${pppoed_enable} in [Yy][Ee][Ss]) if [ -n "${pppoed_provider}" ]; then diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 413dc4f..86db5ea 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -686,31 +686,48 @@ network_pass3() { ;; esac - # Kerberos runs ONLY on the Kerberos server machine - case ${kerberos_server_enable} in + # Kerberos servers run ONLY on the Kerberos server machine + case ${kerberos4_server_enable} in [Yy][Ee][Ss]) case ${kerberos_stash} in [Yy][Ee][Ss]) - stash_flag=-n + stash=-n ;; *) - stash_flag= + stash= ;; esac - echo -n ' kerberos' - kerberos ${stash_flag} >> /var/log/kerberos.log & + echo -n ' kerberosIV' + ${kerberos4_server} ${stash} >> /var/log/kerberos.log & - case ${kadmind_server_enable} in + case ${kadmind4_server_enable} in [Yy][Ee][Ss]) - echo -n ' kadmind' - (sleep 20; kadmind ${stash_flag} >/dev/null 2>&1 &) & + echo -n ' kadmindIV' + ( + sleep 20; + ${kadmind4_server} ${stash} >/dev/null 2>&1 & + ) & ;; esac unset stash_flag ;; esac + case ${kerberos5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kerberos5' + ${kerberos5_server} & + + case ${kadmind5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kadmind5' + ${kadmind5_server} & + ;; + esac + ;; + esac + case ${pppoed_enable} in [Yy][Ee][Ss]) if [ -n "${pppoed_provider}" ]; then diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 413dc4f..86db5ea 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -686,31 +686,48 @@ network_pass3() { ;; esac - # Kerberos runs ONLY on the Kerberos server machine - case ${kerberos_server_enable} in + # Kerberos servers run ONLY on the Kerberos server machine + case ${kerberos4_server_enable} in [Yy][Ee][Ss]) case ${kerberos_stash} in [Yy][Ee][Ss]) - stash_flag=-n + stash=-n ;; *) - stash_flag= + stash= ;; esac - echo -n ' kerberos' - kerberos ${stash_flag} >> /var/log/kerberos.log & + echo -n ' kerberosIV' + ${kerberos4_server} ${stash} >> /var/log/kerberos.log & - case ${kadmind_server_enable} in + case ${kadmind4_server_enable} in [Yy][Ee][Ss]) - echo -n ' kadmind' - (sleep 20; kadmind ${stash_flag} >/dev/null 2>&1 &) & + echo -n ' kadmindIV' + ( + sleep 20; + ${kadmind4_server} ${stash} >/dev/null 2>&1 & + ) & ;; esac unset stash_flag ;; esac + case ${kerberos5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kerberos5' + ${kerberos5_server} & + + case ${kadmind5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kadmind5' + ${kadmind5_server} & + ;; + esac + ;; + esac + case ${pppoed_enable} in [Yy][Ee][Ss]) if [ -n "${pppoed_provider}" ]; then diff --git a/etc/rc.network b/etc/rc.network index 413dc4f..86db5ea 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -686,31 +686,48 @@ network_pass3() { ;; esac - # Kerberos runs ONLY on the Kerberos server machine - case ${kerberos_server_enable} in + # Kerberos servers run ONLY on the Kerberos server machine + case ${kerberos4_server_enable} in [Yy][Ee][Ss]) case ${kerberos_stash} in [Yy][Ee][Ss]) - stash_flag=-n + stash=-n ;; *) - stash_flag= + stash= ;; esac - echo -n ' kerberos' - kerberos ${stash_flag} >> /var/log/kerberos.log & + echo -n ' kerberosIV' + ${kerberos4_server} ${stash} >> /var/log/kerberos.log & - case ${kadmind_server_enable} in + case ${kadmind4_server_enable} in [Yy][Ee][Ss]) - echo -n ' kadmind' - (sleep 20; kadmind ${stash_flag} >/dev/null 2>&1 &) & + echo -n ' kadmindIV' + ( + sleep 20; + ${kadmind4_server} ${stash} >/dev/null 2>&1 & + ) & ;; esac unset stash_flag ;; esac + case ${kerberos5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kerberos5' + ${kerberos5_server} & + + case ${kadmind5_server_enable} in + [Yy][Ee][Ss]) + echo -n ' kadmind5' + ${kadmind5_server} & + ;; + esac + ;; + esac + case ${pppoed_enable} in [Yy][Ee][Ss]) if [ -n "${pppoed_provider}" ]; then |
