Attachment #9843 for bug #34828




touch $LOGFILE
chmod 600 $LOGFILE

usage(){ echo "$0 [-h|--help]"; exit 1; }

adminpw="$(pwgen -1 -s -c -n 16)"
adminpw2="$adminpw"

while getopts  "h-:W:" option; do
	case "${option}" in

				echo "Unknown option --${OPTARG}" >&2
				;;
		esac;;
		w) if [ -r "$OPTARG" ]; then adminpw="$(< $OPTARG)"; adminpw2="$adminpw"; fi ;;
		W) adminpw2='!unset';;
	esac
done


set -- "${UDM_ARGV[@]}"


while [ "$adminpw" != "$adminpw2" ]; do
	read -p "Choose Samba4 admin password: " adminpw
	if [ "${#adminpw}" -lt 8 ]; then
		echo "Password too short, Samba4 minimal requirements: 8 characters, one digit, one uppercase"
		continue
	fi
	read -p "Confirm password: " adminpw2
	if [ "$adminpw" != "$adminpw2" ]; then
		echo "Passwords don't match, please try again"
	fi
done

## Provision Samba4
stop_conflicting_services


	    --domain="$windows_domain" \
	    --domain-sid="$DOMAIN_SID" \
	    --function-level="$samba4_function_level" \
	    --adminpass="$adminpw" \
	    --server-role='domain controller' \
	    ${sitename:+--site="$sitename"} \
	    --machinepass="$(</etc/machine.secret)" 2>&1 | tee -a "$LOGFILE"

Return to bug 34828

Lines 41-50 LOGFILE="/var/log/univention/samba4-provision.log" Link Here

(-)a/services/univention-samba4/scripts/setup-s4.sh (-19 / +1 lines)
41	touch $LOGFILE	41	touch $LOGFILE
42	chmod 600 $LOGFILE	42	chmod 600 $LOGFILE
43		43
44	usage(){ echo "$0 [-h\|--help] [-w <samba4-admin password file>] [-W]"; exit 1; }	44	usage(){ echo "$0 [-h\|--help]"; exit 1; }
45
46	adminpw="$(pwgen -1 -s -c -n 16)"
47	adminpw2="$adminpw"
48		45
49	while getopts "h-:W:" option; do	46	while getopts "h-:W:" option; do
50	case "${option}" in	47	case "${option}" in
Lines 83-90 while getopts "h-:W:" option; do Link Here
83	echo "Unknown option --${OPTARG}" >&2	80	echo "Unknown option --${OPTARG}" >&2
84	;;	81	;;
85	esac;;	82	esac;;
86	w) if [ -r "$OPTARG" ]; then adminpw="$(< $OPTARG)"; adminpw2="$adminpw"; fi ;;
87	W) adminpw2='!unset';;
88	esac	83	esac
89	done	84	done
90		85
Lines 183-200 fi Link Here
183	set -- "${UDM_ARGV[@]}"	178	set -- "${UDM_ARGV[@]}"
184		179
185		180
186	while [ "$adminpw" != "$adminpw2" ]; do
187	read -p "Choose Samba4 admin password: " adminpw
188	if [ "${#adminpw}" -lt 8 ]; then
189	echo "Password too short, Samba4 minimal requirements: 8 characters, one digit, one uppercase"
190	continue
191	fi
192	read -p "Confirm password: " adminpw2
193	if [ "$adminpw" != "$adminpw2" ]; then
194	echo "Passwords don't match, please try again"
195	fi
196	done
197
198	## Provision Samba4	181	## Provision Samba4
199	stop_conflicting_services	182	stop_conflicting_services
200		183
Lines 252-258 run_samba_domain_provision() { Link Here
252	--domain="$windows_domain" \	235	--domain="$windows_domain" \
253	--domain-sid="$DOMAIN_SID" \	236	--domain-sid="$DOMAIN_SID" \
254	--function-level="$samba4_function_level" \	237	--function-level="$samba4_function_level" \
255	--adminpass="$adminpw" \
256	--server-role='domain controller' \	238	--server-role='domain controller' \
257	${sitename:+--site="$sitename"} \	239	${sitename:+--site="$sitename"} \
258	--machinepass="$(</etc/machine.secret)" 2>&1 \| tee -a "$LOGFILE"	240	--machinepass="$(</etc/machine.secret)" 2>&1 \| tee -a "$LOGFILE"