From fc03792b64d6b99b8aa273dac7d409fcf5f6f84a Mon Sep 17 00:00:00 2001 From: Paul Wolneykien Date: Wed, 20 Jul 2011 03:14:54 +0400 Subject: [PATCH] Process 'krb5' mode the same way as 'ldap' --- alterator-ldap-users/backend3/ldap-users | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/alterator-ldap-users/backend3/ldap-users b/alterator-ldap-users/backend3/ldap-users index d32ee73..3f14e9b 100755 --- a/alterator-ldap-users/backend3/ldap-users +++ b/alterator-ldap-users/backend3/ldap-users @@ -280,7 +280,8 @@ read_ldap_photo(){ user_read(){ local name="$1";shift - if [ -n "$mode" -a "$mode" == "ldap" ];then + case "$mode" in + ldap|krb5) ldap-getent passwd "$name" uid userPassword givenName sn cn o ou title telephoneNumber mobile homeDirectory loginShell uidNumber departmentNumber postalAddress| (IFS=: read name userpassword givenname sn cn o ou title telephonenumber mobile homedirectory loginshell uidNumber departmentnumber postaladdress; patronym="$(echo ${cn#$sn})" @@ -296,7 +297,8 @@ user_read(){ write_bool_param is_active false || write_bool_param is_active true ) - else + ;; + *) getent passwd "$name" | (IFS=: read uid userpassword uidNumber gidNumber gecos homedirectory loginshell; for f in uid userpassword uidNumber gecos homedirectory loginshell; do @@ -308,7 +310,8 @@ user_read(){ done done ) - fi + ;; + esac } ldap_user_add_default_groups(){ @@ -405,7 +408,8 @@ read_userlist(){ [ -z "$in_maxuid" -o "$in_maxuid" == "#f" ] && in_maxuid="9000" [ "$in_maxuid" -gt "$in_minuid" ] || in_minuid="$in_maxuid" - if [ -n "$mode" -a "$mode" == "ldap" ];then + case "$mode" in + ldap|krb5) local IFS=$'\n' for i in $(ldap-getent passwd '*' uid uidNumber|sort) ;do echo $i | @@ -415,7 +419,8 @@ read_userlist(){ fi done done - else + ;; + *) local IFS=$'\n' for i in $(getent passwd | sort);do echo $i | @@ -425,7 +430,8 @@ read_userlist(){ fi done done - fi + ;; + esac } list_bases(){ @@ -741,7 +747,7 @@ on_message(){ local) userdel "$user" || return ;; - ldap) + ldap|krb5) user_delete "$user" || return ldap_user_del_default_groups "$user" ;; -- 1.7.3.3