From bce47c00d7617cb59314db5392b066f868ffc43e Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@panoulu.net>
Date: Mon, 7 Jun 2010 16:39:23 +0300
Subject: [PATCH] Fixed duplicate includes and OpenBSD dependencies in user
 module.

---
 user/scripts/update-classes.rb | 7 +++----
 user/scripts/update-virtual.rb | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user/scripts/update-classes.rb b/user/scripts/update-classes.rb
index 9e83f9c..940c534 100755
--- a/user/scripts/update-classes.rb
+++ b/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"
diff --git a/user/scripts/update-virtual.rb b/user/scripts/update-virtual.rb
index bbed103..990f8d5 100755
--- a/user/scripts/update-virtual.rb
+++ b/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}":