From 8e2f5020cdd3d84b60f0362f57f2bd30ad21a865 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 23 Feb 2022 12:01:51 +0100 Subject: [PATCH] s4:scripting: Reformat shell scripts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit shfmt -f source4/scripting/ | xargs shfmt -w -p -i 0 -fn Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- source4/scripting/bin/ktpass.sh | 117 ++++++++++++-------- source4/scripting/bin/setup_dns.sh | 16 +-- source4/scripting/devel/drs/revampire_ad.sh | 10 +- source4/scripting/devel/drs/unvampire_ad.sh | 4 +- source4/scripting/devel/drs/vampire_ad.sh | 10 +- source4/scripting/devel/nmfind | 10 +- source4/scripting/devel/rebuild_zone.sh | 66 +++++------ source4/scripting/devel/tmpfs.sh | 6 +- source4/scripting/devel/watch_servers.sh | 4 +- 9 files changed, 135 insertions(+), 108 deletions(-) diff --git a/source4/scripting/bin/ktpass.sh b/source4/scripting/bin/ktpass.sh index e758eb3bfb7..a165816b1c3 100755 --- a/source4/scripting/bin/ktpass.sh +++ b/source4/scripting/bin/ktpass.sh @@ -19,69 +19,94 @@ # along with this program. If not, see . name="ktpass.sh" -TEMP=`getopt -o h --long princ:,pass:,out:,host:,ptype:,enc:,path-to-ldbsearch: \ - -n "$name" -- "$@"` +TEMP=$(getopt -o h --long princ:,pass:,out:,host:,ptype:,enc:,path-to-ldbsearch: \ + -n "$name" -- "$@") eval set -- "$TEMP" -usage () { - echo -ne "$name --out --princ --pass |*\n" - echo -ne " [--host hostname] [--enc ]\n" - echo -ne " [--ptype ] [--path-to-ldbsearch ]\n" - echo -ne "\nEncoding should be one of:\n" - echo -ne " * des-cbc-crc\n" - echo -ne " * des-cbc-md5\n" - echo -ne " * rc4-hmac (default)\n" - echo -ne " * aes128-cts\n" - echo -ne " * aes256-cts\n" - exit 0 +usage() +{ + echo -ne "$name --out --princ --pass |*\n" + echo -ne " [--host hostname] [--enc ]\n" + echo -ne " [--ptype ] [--path-to-ldbsearch ]\n" + echo -ne "\nEncoding should be one of:\n" + echo -ne " * des-cbc-crc\n" + echo -ne " * des-cbc-md5\n" + echo -ne " * rc4-hmac (default)\n" + echo -ne " * aes128-cts\n" + echo -ne " * aes256-cts\n" + exit 0 } -while true ; do - case "$1" in - --out) outfile=$2 ; shift 2 ;; - --princ) princ=$2 ; shift 2 ;; - --pass) pass=$2 ; shift 2 ;; - --host) host=$2 ; shift 2 ;; - --ptype) shift 2 ;; - --enc) enc=$2; shift 2;; - --path-to-ldbsearch) path="$2/"; shift 2;; - -h) usage;; - --) shift ; break ;; - *) echo "Internal error!" ; exit 1 ;; - esac +while true; do + case "$1" in + --out) + outfile=$2 + shift 2 + ;; + --princ) + princ=$2 + shift 2 + ;; + --pass) + pass=$2 + shift 2 + ;; + --host) + host=$2 + shift 2 + ;; + --ptype) shift 2 ;; + --enc) + enc=$2 + shift 2 + ;; + --path-to-ldbsearch) + path="$2/" + shift 2 + ;; + -h) usage ;; + --) + shift + break + ;; + *) + echo "Internal error!" + exit 1 + ;; + esac done #RC4-HMAC-NT|AES256-SHA1|AES128-SHA if [ -z "$enc" ]; then - enc="rc4-hmac" + enc="rc4-hmac" fi if [ -z "$path" ]; then - path=`dirname $0`/../bin/ - if [ ! -f ${path}ldbsearch ]; then - path=`dirname $0`/../../bin/ - fi + path=$(dirname $0)/../bin/ + if [ ! -f ${path}ldbsearch ]; then + path=$(dirname $0)/../../bin/ + fi fi if [ -z "$outfile" -o -z "$princ" -o -z "$pass" ]; then - echo "At least one mandatory parameter (--out, --princ, --pass) was not specified" - usage + echo "At least one mandatory parameter (--out, --princ, --pass) was not specified" + usage fi if [ -z $host ]; then - host=`hostname` + host=$(hostname) fi -kvno=`${path}ldbsearch -H ldap://$host "(|(samaccountname=$princ)(serviceprincipalname=$princ)(userprincipalname=$princ))" msds-keyversionnumber -k 1 -N 2>/dev/null| grep -i msds-keyversionnumber` +kvno=$(${path}ldbsearch -H ldap://$host "(|(samaccountname=$princ)(serviceprincipalname=$princ)(userprincipalname=$princ))" msds-keyversionnumber -k 1 -N 2>/dev/null | grep -i msds-keyversionnumber) if [ x"$kvno" = x"" ]; then - echo -ne "Unable to find kvno for principal $princ\n" - echo -ne " check that you are authentified with kerberos\n" - exit 1 + echo -ne "Unable to find kvno for principal $princ\n" + echo -ne " check that you are authentified with kerberos\n" + exit 1 else - kvno=`echo $kvno | sed 's/^.*: //'` + kvno=$(echo $kvno | sed 's/^.*: //') fi if [ "$pass" = "*" ]; then - echo -n "Enter password for $princ: " - stty -echo - read pass - stty echo - echo "" + echo -n "Enter password for $princ: " + stty -echo + read pass + stty echo + echo "" fi ktutil >/dev/null < /dev/null) + PRIVATEDIR=$(bin/samba-tool testparm --section-name=global --parameter-name='private dir' --suppress-prompt 2>/dev/null) } -OBJECTGUID=$(bin/ldbsearch --scope=base -H "$PRIVATEDIR/sam.ldb" -b "CN=NTDS Settings,CN=$HOSTNAME,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=$RSUFFIX" objectguid|grep ^objectGUID| cut -d: -f2) +OBJECTGUID=$(bin/ldbsearch --scope=base -H "$PRIVATEDIR/sam.ldb" -b "CN=NTDS Settings,CN=$HOSTNAME,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=$RSUFFIX" objectguid | grep ^objectGUID | cut -d: -f2) samba4kinit=kinit if test -x $BINDIR/samba4kinit; then @@ -29,13 +29,13 @@ echo "Running kinit for $HOSTNAME\$@$DOMAIN" $samba4kinit -e arcfour-hmac-md5 -k -t "$PRIVATEDIR/secrets.keytab" $HOSTNAME\$@$DOMAIN || exit 1 echo "Adding $HOSTNAME.$DOMAIN" scripting/bin/nsupdate-gss --noverify $HOSTNAME $DOMAIN $IP 300 || { - echo "Failed to add A record" - exit 1 + echo "Failed to add A record" + exit 1 } echo "Adding $OBJECTGUID._msdcs.$DOMAIN => $HOSTNAME.$DOMAIN" scripting/bin/nsupdate-gss --realm=$DOMAIN --noverify --ntype="CNAME" $OBJECTGUID _msdcs.$DOMAIN $HOSTNAME.$DOMAIN 300 || { - echo "Failed to add CNAME" - exit 1 + echo "Failed to add CNAME" + exit 1 } echo "Checking" rndc flush diff --git a/source4/scripting/devel/drs/revampire_ad.sh b/source4/scripting/devel/drs/revampire_ad.sh index 522601c87e9..cd3164ca131 100755 --- a/source4/scripting/devel/drs/revampire_ad.sh +++ b/source4/scripting/devel/drs/revampire_ad.sh @@ -2,18 +2,18 @@ set -x -. `dirname $0`/vars +. $(dirname $0)/vars -`dirname $0`/vampire_ad.sh || exit 1 +$(dirname $0)/vampire_ad.sh || exit 1 -ntds_guid=$(sudo bin/ldbsearch -H $PREFIX/private/sam.ldb -b "CN=NTDS Settings,CN=$machine,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,$dn" objectGUID|grep ^objectGUID| awk '{print $2}') +ntds_guid=$(sudo bin/ldbsearch -H $PREFIX/private/sam.ldb -b "CN=NTDS Settings,CN=$machine,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,$dn" objectGUID | grep ^objectGUID | awk '{print $2}') cp $PREFIX/private/$DNSDOMAIN.zone{.template,} sed -i "s/NTDSGUID/$ntds_guid/g" $PREFIX/private/$DNSDOMAIN.zone cp $PREFIX/private/named.conf{.local,} sudo rndc reconfig -fsmotmp=`mktemp fsmo.ldif.XXXXXXXXX` -cp `dirname $0`/fsmo.ldif.template $fsmotmp +fsmotmp=$(mktemp fsmo.ldif.XXXXXXXXX) +cp $(dirname $0)/fsmo.ldif.template $fsmotmp sed -i "s/NTDSGUID/$ntds_guid/g" $fsmotmp sed -i "s/MACHINE/$machine/g" $fsmotmp sed -i "s/DNSDOMAIN/$DNSDOMAIN/g" $fsmotmp diff --git a/source4/scripting/devel/drs/unvampire_ad.sh b/source4/scripting/devel/drs/unvampire_ad.sh index dbd3cfb431a..c0053746934 100755 --- a/source4/scripting/devel/drs/unvampire_ad.sh +++ b/source4/scripting/devel/drs/unvampire_ad.sh @@ -2,10 +2,10 @@ set -x -. `dirname $0`/vars +. $(dirname $0)/vars if [ -z "$site" ]; then - site="Default-First-Site-Name" + site="Default-First-Site-Name" fi bin/ldbdel -r -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,CN=Computers,$dn" diff --git a/source4/scripting/devel/drs/vampire_ad.sh b/source4/scripting/devel/drs/vampire_ad.sh index 031e3c9052d..f3cdc3c8af9 100755 --- a/source4/scripting/devel/drs/vampire_ad.sh +++ b/source4/scripting/devel/drs/vampire_ad.sh @@ -2,18 +2,18 @@ set -x -. `dirname $0`/vars +. $(dirname $0)/vars -namedtmp=`mktemp named.conf.ad.XXXXXXXXX` -cp `dirname $0`/named.conf.ad.template $namedtmp +namedtmp=$(mktemp named.conf.ad.XXXXXXXXX) +cp $(dirname $0)/named.conf.ad.template $namedtmp sed -i "s/DNSDOMAIN/$DNSDOMAIN/g" $namedtmp sed -i "s/SERVERIP/$server_ip/g" $namedtmp chmod a+r $namedtmp mv -f $namedtmp $PREFIX/private/named.conf sudo rndc reconfig -`dirname $0`/unvampire_ad.sh +$(dirname $0)/unvampire_ad.sh -cat < nsupdate.txt +cat <nsupdate.txt update delete $DNSDOMAIN A $machine_ip show send diff --git a/source4/scripting/devel/nmfind b/source4/scripting/devel/nmfind index 54935f213d3..865c0d71acf 100755 --- a/source4/scripting/devel/nmfind +++ b/source4/scripting/devel/nmfind @@ -7,9 +7,9 @@ TARGET=$1 shift for f in $*; do -if nm $f 2>&1 | grep $TARGET > /dev/null; then - echo [$f] - nm $f | grep $TARGET - echo -fi + if nm $f 2>&1 | grep $TARGET >/dev/null; then + echo [$f] + nm $f | grep $TARGET + echo + fi done diff --git a/source4/scripting/devel/rebuild_zone.sh b/source4/scripting/devel/rebuild_zone.sh index 771a009c555..94d1f9ef84c 100755 --- a/source4/scripting/devel/rebuild_zone.sh +++ b/source4/scripting/devel/rebuild_zone.sh @@ -2,8 +2,8 @@ # rebuild a zone file, adding all DCs [ $# -eq 2 ] || { - echo "rebuild_zone.sh " - exit 1 + echo "rebuild_zone.sh " + exit 1 } LDB="$1" @@ -12,26 +12,28 @@ ZFILE="$2" dnshostname=$(bin/ldbsearch -H $LDB --scope=base -b '' dnsHostname | grep ^dns | cut -d' ' -f2) host=$(echo $dnshostname | cut -d. -f1) realm=$(echo $dnshostname | cut -d. -f2-) -GUIDs=$(bin/ldbsearch -H $LDB objectclass=ntdsdsa objectguid --cross-ncs|grep ^objectGUID| cut -d' ' -f2) -DOMAINGUID=$(bin/ldbsearch -H $LDB --scope=base objectguid |grep ^objectGUID| cut -d' ' -f2) +GUIDs=$(bin/ldbsearch -H $LDB objectclass=ntdsdsa objectguid --cross-ncs | grep ^objectGUID | cut -d' ' -f2) +DOMAINGUID=$(bin/ldbsearch -H $LDB --scope=base objectguid | grep ^objectGUID | cut -d' ' -f2) -dcname() { - GUID=$1 - echo $(bin/ldbsearch -H $LDB objectguid=$GUID dn --cross-ncs|grep CN=NTDS.Settings| cut -d, -f2| cut -d= -f2) +dcname() +{ + GUID=$1 + echo $(bin/ldbsearch -H $LDB objectguid=$GUID dn --cross-ncs | grep CN=NTDS.Settings | cut -d, -f2 | cut -d= -f2) } -getip() { - NAME=$1 - ret=$(nmblookup $NAME| egrep '^[0-9]' | head -1 | cut -d' ' -f1) - test -n "$ret" || { - echo "Unable to find IP for $NAME. Using XX.XX.XX.XX. Please edit" 1>&2 - echo "XX.XX.XX.XX" - } - echo $ret +getip() +{ + NAME=$1 + ret=$(nmblookup $NAME | egrep '^[0-9]' | head -1 | cut -d' ' -f1) + test -n "$ret" || { + echo "Unable to find IP for $NAME. Using XX.XX.XX.XX. Please edit" 1>&2 + echo "XX.XX.XX.XX" + } + echo $ret } echo "Generating header for host $host in realm $realm" -cat < $ZFILE +cat <$ZFILE ; -*- zone -*- ; generated by rebuild_zone.sh \$ORIGIN $realm. @@ -47,27 +49,27 @@ cat < $ZFILE EOF for GUID in $GUIDs; do - dc=$(dcname $GUID) - echo "Generating IP for DC $dc" - ip=$(getip $dc) - test -n "$ip" || exit 1 - echo " IN A $ip" >> $ZFILE + dc=$(dcname $GUID) + echo "Generating IP for DC $dc" + ip=$(getip $dc) + test -n "$ip" || exit 1 + echo " IN A $ip" >>$ZFILE done -echo "; IP Addresses" >> $ZFILE +echo "; IP Addresses" >>$ZFILE for GUID in $GUIDs; do - dc=$(dcname $GUID) - ip=$(getip $dc) - test -n "$ip" || exit 1 - echo "$dc IN A $ip" >> $ZFILE + dc=$(dcname $GUID) + ip=$(getip $dc) + test -n "$ip" || exit 1 + echo "$dc IN A $ip" >>$ZFILE done for GUID in $GUIDs; do - dc=$(dcname $GUID) - ip=$(getip $dc) - test -n "$ip" || exit 1 - echo "Generating zone body for DC $dc with IP $ip" -cat <> $ZFILE + dc=$(dcname $GUID) + ip=$(getip $dc) + test -n "$ip" || exit 1 + echo "Generating zone body for DC $dc with IP $ip" + cat <>$ZFILE ; ; Entries for $dc gc._msdcs IN A $ip @@ -94,7 +96,7 @@ _kpasswd._udp IN SRV 0 100 464 $dc EOF done -cat <> $ZFILE +cat <>$ZFILE ; kerberos hack _kerberos IN TXT $(echo $realm | tr [a-z] [A-Z]) diff --git a/source4/scripting/devel/tmpfs.sh b/source4/scripting/devel/tmpfs.sh index 44ee04b2cef..e4798ecf6e7 100755 --- a/source4/scripting/devel/tmpfs.sh +++ b/source4/scripting/devel/tmpfs.sh @@ -4,9 +4,9 @@ # time waiting on the disk! sudo echo "About to (re)mount bin and st as tmpfs" -rm -rf bin st -sudo umount bin > /dev/null 2>&1 -sudo umount st > /dev/null 2>&1 +rm -rf bin st +sudo umount bin >/dev/null 2>&1 +sudo umount st >/dev/null 2>&1 mkdir -p bin st || exit 1 sudo mount -t tmpfs /dev/null bin || exit 1 sudo chown $USER bin/. || exit 1 diff --git a/source4/scripting/devel/watch_servers.sh b/source4/scripting/devel/watch_servers.sh index 48209cbe46a..88d66a2456a 100644 --- a/source4/scripting/devel/watch_servers.sh +++ b/source4/scripting/devel/watch_servers.sh @@ -1,8 +1,8 @@ #!/bin/sh [ $# -ge 3 ] || { - echo "Usage: watch_servers.sh DB1 DB2 PASSWORD SEARCH " - exit 1 + echo "Usage: watch_servers.sh DB1 DB2 PASSWORD SEARCH " + exit 1 } host1="$1" -- 2.47.3