Remove check_samba_user and add_samba_user scripts

Call the pdbedit commands directly from samba::server::user instead

2 files changed, 5 insertions, 19 deletions

diff --git a/manifests/server.pp b/manifests/server.pp
index 550659c..8a5853c 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -58,20 +58,4 @@ class samba::server($interfaces = '',
     'os level':             value => $os_level;
     'preferred master':     value => $preferred_master;
   }
-
-  file {'/sbin/check_samba_user':
-    # script checks to see if a samba account exists for a given user
-    owner   => root,
-    group   => root,
-    mode    => '0755',
-    content => template("${module_name}/check_samba_user"),
-  }
-
-  file {'/sbin/add_samba_user':
-    # script creates a new samba account for a given user and password
-    owner   => root,
-    group   => root,
-    mode    => '0755',
-    content => template("${module_name}/add_samba_user"),
-  }
 }
diff --git a/manifests/server/user.pp b/manifests/server/user.pp
index b8f2e61..d10a602 100644
--- a/manifests/server/user.pp
+++ b/manifests/server/user.pp
@@ -4,10 +4,12 @@ define samba::server::user (
   $password,
   $user_name = $name,
 ) {
+  require ::samba::server::install
+
   exec { "add smb account for ${user_name}":
-    command => "/sbin/add_samba_user '${user_name}' '${password}'" ,
-    unless  => "/sbin/check_samba_user '${user_name}'" ,
+    command => "/bin/echo -e '${password}\\n${password}\\n' | /usr/bin/pdbedit --password-from-stdin -a '${user_name}'",
+    unless  => "/usr/bin/pdbedit '${user_name}'",
     require => [ User[$user_name] ],
-    notify  => Class['samba::server::service']
+    notify  => Class['samba::server::service'] #TODO: Is this really required??
   }
 }