From eb6c282bac34b69e854113e0faa982d4d868a485 Mon Sep 17 00:00:00 2001 From: David Personette Date: Tue, 19 Dec 2017 10:30:02 -0500 Subject: [PATCH] samba.sh don't try to recreate users --- samba.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samba.sh b/samba.sh index d23929a..a45dba2 100755 --- a/samba.sh +++ b/samba.sh @@ -51,7 +51,7 @@ global() { local key="${1%%=*}" value="${1#*=}" file=/etc/samba/smb.conf # Return: user(s) added to container import() { local name id file="$1" while read name id; do - adduser -D -H -u "$id" "$name" + grep -q "^$user:" /etc/passwd || adduser -D -H -u "$id" "$name" done < <(cut -d: -f1,2 $file | sed 's/:/ /') pdbedit -i smbpasswd:$file } @@ -126,7 +126,8 @@ smb() { local file=/etc/samba/smb.conf # Return: user added to container user() { local name="${1}" passwd="${2}" id="${3:-""}" group="${4:-""}" [[ "$group" ]] && { grep -q "^$group:" /etc/group || addgroup "$group"; } - adduser -D -H ${group:+-G $group} ${id:+-u $id} "$name" + grep -q "^$user:" /etc/passwd || + adduser -D -H ${group:+-G $group} ${id:+-u $id} "$name" echo -e "$passwd\n$passwd" | smbpasswd -s -a "$name" }