[Ltb-changes] r140 - openldap-mmr/trunk

[tchemineau]

Author: tchemineau
Date: 2010-09-23 15:57:00 +0200 (Thu, 23 Sep 2010)
New Revision: 140

Modified:
   openldap-mmr/trunk/functions
   openldap-mmr/trunk/mmr-addnode
   openldap-mmr/trunk/mmr-initprov
   openldap-mmr/trunk/mmr-migrate
   openldap-mmr/trunk/mmr-passwd
Log:
fix #283 - check if user/group exists before using tools

Modified: openldap-mmr/trunk/functions
===================================================================
--- openldap-mmr/trunk/functions        2010-09-23 13:42:19 UTC (rev 139)
+++ openldap-mmr/trunk/functions        2010-09-23 13:57:00 UTC (rev 140)
@@ -248,6 +248,20 @@
 }
 
 #
+# Check if user/group are available.
+#
+CHECK_GROUP_AND_USER ()
+{
+  if [ -z "`getent passwd | cut -d ':' -f 1 | grep ${LDAP_USERNAME}`" ]; then
+    return 1
+  fi
+  if [ -z "`getent group | cut -d ':' -f 1 | grep ${LDAP_GROUPNAME}`" ]; then
+    return 1
+  fi
+  return 0
+}
+
+#
 # Check available binaries.
 #
 CHECK_OPENLDAP_BINARIES ()

Modified: openldap-mmr/trunk/mmr-addnode
===================================================================
--- openldap-mmr/trunk/mmr-addnode      2010-09-23 13:42:19 UTC (rev 139)
+++ openldap-mmr/trunk/mmr-addnode      2010-09-23 13:57:00 UTC (rev 140)
@@ -116,6 +116,11 @@
   echo "Can not find openldap binaries"
   exit 1
 fi
+CHECK_GROUP_AND_USER
+if [ $? -ne 0 ]; then
+  echo "Configured group or user do not exist"
+  exit 1
+fi
 
 # -- Ask for parameters --
 

Modified: openldap-mmr/trunk/mmr-initprov
===================================================================
--- openldap-mmr/trunk/mmr-initprov     2010-09-23 13:42:19 UTC (rev 139)
+++ openldap-mmr/trunk/mmr-initprov     2010-09-23 13:57:00 UTC (rev 140)
@@ -199,6 +199,11 @@
   echo "Can not find openldap binaries"
   exit 1
 fi
+CHECK_GROUP_AND_USER
+if [ $? -ne 0 ]; then
+  echo "Configured group or user do not exist"
+  exit 1
+fi
 
 # -- Ask for parameters --
 

Modified: openldap-mmr/trunk/mmr-migrate
===================================================================
--- openldap-mmr/trunk/mmr-migrate      2010-09-23 13:42:19 UTC (rev 139)
+++ openldap-mmr/trunk/mmr-migrate      2010-09-23 13:57:00 UTC (rev 140)
@@ -252,6 +252,11 @@
   echo "Can not find openldap binaries"
   exit 1
 fi
+CHECK_GROUP_AND_USER
+if [ $? -ne 0 ]; then
+  echo "Configured group or user do not exist"
+  exit 1
+fi
 
 # -- Ask for parameters --
 

Modified: openldap-mmr/trunk/mmr-passwd
===================================================================
--- openldap-mmr/trunk/mmr-passwd       2010-09-23 13:42:19 UTC (rev 139)
+++ openldap-mmr/trunk/mmr-passwd       2010-09-23 13:57:00 UTC (rev 140)
@@ -210,6 +210,11 @@
   echo "Can not find openldap binaries"
   exit 1
 fi
+CHECK_GROUP_AND_USER
+if [ $? -ne 0 ]; then
+  echo "Configured group or user do not exist"
+  exit 1
+fi
 
 # -- Ask for parameters --
 

_______________________________________________
ltb-changes mailing list
ltb-changes@lists.ltb-project.org
http://lists.ltb-project.org/listinfo/ltb-changes