nfsmounts.py.diff0000644000450600116110000000163411650024446015125 0ustar lwalterDomain Users--- nfsmounts.py.o 2011-10-20 14:56:13.000000000 +0200 +++ nfsmounts.py 2011-10-20 15:58:51.000000000 +0200 @@ -86,9 +86,10 @@ print >>out, '' def main(): + ldap_server = configRegistry['ldap/server/name'] # parse command line try: - opts, pargs = getopt.getopt(sys.argv[1:], 'hsv', ['help', 'simulate', 'verbose']) + opts, pargs = getopt.getopt(sys.argv[1:], 'hsvh', ['help', 'simulate', 'verbose', 'host']) except: usage(sys.stderr) sys.exit(2) @@ -104,6 +105,8 @@ elif option == '-v' or option == '--verbose': global verbose verbose = True + elif option == '--host': + ldap_server = value hostdn = configRegistry.get('ldap/hostdn') if not hostdn: @@ -113,7 +116,6 @@ nfsmounts = query_policy(hostdn) - ldap_server = configRegistry['ldap/server/name'] debug("Using ldap server %s\n" % ldap_server) lo = ldap.initialize("ldap://%s" % ldap_server) lo.simple_bind_s("","") univention-directory-policy.init.diff0000644000450600116110000000110011650023577021071 0ustar lwalterDomain Users--- univention-directory-policy.init.o 2011-10-20 14:07:26.000000000 +0200 +++ univention-directory-policy.init 2011-10-20 15:27:39.000000000 +0200 @@ -47,6 +47,18 @@ fi else log_end_msg 1 + for host in $ldap_server_addition; do + if /bin/netcat -q0 -w4 $host 389 /dev/null 2>&1; then + run-parts /usr/lib/univention-directory-policy --host $host>>/var/log/univention/ldap-policy.log 2>&1 + if [ $? = 0 ]; then + log_end_msg 0 + else + log_end_msg 1 + fi + else + log_end_msg 1 + fi + done fi ;; stop)