--- alx-src/branches/alxconf-060/functions/config_auth.sh	2011/05/07 10:51:10	1968
+++ alx-src/branches/alxconf-060/functions/config_auth.sh	2011/05/07 11:00:49	1969
@@ -1,4 +1,4 @@
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_auth.sh,v 1.7 2005-10-09 21:28:28 niro Exp $
+# $Id$
 # configures the system authentification via mysql db settings
 
 get_auth_settings()
@@ -8,12 +8,10 @@
 	# get settings from database
 	ALX_AUTH_SHELL_PW=$(mysqldo "select shell from client_auth where serial='${ALX_SERIAL}'")
 	ALX_AUTH_VNC_PW=$(mysqldo "select vnc from client_auth where serial='${ALX_SERIAL}'")
-	ALX_AUTH_SAMBA_PW=$(mysqldo "select samba from client_auth where serial='${ALX_SERIAL}'")
 	ALX_AUTH_STATION_PW=$(mysqldo "select station from client_auth where serial='${ALX_SERIAL}'")
 
 	export ALX_AUTH_SHELL_PW
 	export ALX_AUTH_VNC_PW
-	export ALX_AUTH_SAMBA_PW
 	export ALX_AUTH_STATION_PW
 }
 
@@ -28,20 +26,6 @@
 	[ -n "${ALX_AUTH_STATION_PW}" ] && \
 		usermod -p $(openssl passwd -1 ${ALX_AUTH_SHELL_PW}) ${ALX_UNPRIV_USER}
 
-	if [ -n "${ALX_AUTH_SAMBA_PW}" ]
-	then
-		# >smb3 smbpasswd -a user password does not work anymore
-		if [[ $(smbd --version | cut -d' ' -f2) > 2.999 ]]
-		then
-			smbpasswd -a root -s << EOF
-${ALX_AUTH_SAMBA_PW}
-${ALX_AUTH_SAMBA_PW}
-EOF
-		else
-			smbpasswd -a root ${ALX_AUTH_SAMBA_PW}
-		fi
-	fi
-
 	# vnc passwd (min 6 chars)
 	if [ -n "${ALX_AUTH_VNC_PW}" ]
 	then
@@ -55,6 +39,5 @@
 	# unset vars
 	unset ALX_AUTH_SHELL_PW
 	unset ALX_AUTH_VNC_PW
-	unset ALX_AUTH_SAMBA_PW
 	unset ALX_AUTH_STATION_PW
 }