Fixed duplicate includes and OpenBSD dependencies in user module.

user/scripts/update-classes.rb

@@ -58,9 +58,8 @@ conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, 'objectClass=posixAccount',
     
     # create user class
     if entry['uid'][0] !~ /.*\$.*/
-	print "class user::" + entry['uid'][0] + " {\n"
-        print "    include user::virtual\n"
-	print "    realize(User::Virtual::Newuser['" + entry['uid'][0] + "'])\n"
+	print "class user::" + entry['uid'][0] + " inherits user::virtual {\n"
+	print "    realize(Newuser['" + entry['uid'][0] + "'])\n"
 	groups.each do |group|
 	    print "    realize(Group['" + group + "'])\n"
 	end
@@ -91,7 +90,7 @@ conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, 'objectClass=posixGroup',
     end
     if members.length > 0
 	print "class user::group::" + entry['cn'][0] + " {\n"
-	members.each do |member|
+	members.uniq.sort.each do |member|
 	    print "    include user::" + member + "\n"
 	end
 	print "}\n\n"

user/scripts/update-virtual.rb

@@ -64,6 +64,7 @@ class user::virtual {
             command     => "usermod -L ldap ${name}",
             path        => "/sbin:/usr/sbin:/bin:/usr/bin",
             refreshonly => true,
+            require     => File["/etc/login.conf"],
         }
 
         exec { "user-home-${name}":