[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  ac7d0b45fc7 Move LSP stuff to buildtools/devel_env.sh
       via  012d81d0e28 Add missing final newline to end of sh file
       via  59d1044e557 Add missing final newline to end of c file
      from  4b0296995cc smbd: consolidate nested if expressions

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ac7d0b45fc71d1031d96e9ec0faec2ea8cf78d33
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 16 15:32:11 2022 +0100

    Move LSP stuff to buildtools/devel_env.sh
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Apr  1 11:20:35 UTC 2022 on sn-devel-184

commit 012d81d0e28e81be3274076a5f70282e8ceac8fe
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 16 15:42:39 2022 +0100

    Add missing final newline to end of sh file
    
    find $(pwd) -type f -name "*.sh" | xargs sed -i -e '$a\'
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 59d1044e557d10f8aee3b4900f57e0ebbe6def88
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 16 15:40:28 2022 +0100

    Add missing final newline to end of c file
    
    find $(pwd) -type f -name "*.c" | xargs sed -i -e '$a\'
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/devel_env.sh                      | 7 +++++++
 selftest/devel_env.sh                        | 4 ----
 source3/script/tests/test_rpcclientsrvsvc.sh | 2 +-
 source4/kdc/mit-kdb/kdb_samba_policies.c     | 2 +-
 third_party/waf/update.sh                    | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 buildtools/devel_env.sh


Changeset truncated at 500 lines:

diff --git a/buildtools/devel_env.sh b/buildtools/devel_env.sh
new file mode 100644
index 00000000000..9f87a4a1b36
--- /dev/null
+++ b/buildtools/devel_env.sh
@@ -0,0 +1,7 @@
+# This file can be sourced using
+#
+# source buildtools/devel_env.sh
+
+# Setup python path for lsp server
+PYTHONPATH="$(pwd)/third_party/waf:$(pwd)/python:$(pwd)/bin/python:$(pwd)/selftest:${PYTHONPATH}"
+export PYTHONPATH
diff --git a/selftest/devel_env.sh b/selftest/devel_env.sh
index 1409d30c92b..d1c0736ab09 100644
--- a/selftest/devel_env.sh
+++ b/selftest/devel_env.sh
@@ -9,7 +9,3 @@ export TDB_NO_FSYNC=1
 export NMBD_DONT_LOG_STDOUT=1
 export SMBD_DONT_LOG_STDOUT=1
 export WINBINDD_DONT_LOG_STDOUT=1
-
-# Setup python path for lsp server
-PYTHONPATH="$(pwd)/third_party/waf:$(pwd)/python:$(pwd)/bin/python:$(pwd)/selftest:$PYTHONPATH"
-export PYTHONPATH
diff --git a/source3/script/tests/test_rpcclientsrvsvc.sh b/source3/script/tests/test_rpcclientsrvsvc.sh
index aa638e1cdc0..cbe4e846f36 100755
--- a/source3/script/tests/test_rpcclientsrvsvc.sh
+++ b/source3/script/tests/test_rpcclientsrvsvc.sh
@@ -87,4 +87,4 @@ $RPCCLIENTCMD -c "netsharegetinfo '$SHARENAME' 1005"
 RC=$?
 testit "querying deleted share" test $RC -eq 1 ||  failed=$(expr $failed + 1)
 
-testok $0 $failed
\ No newline at end of file
+testok $0 $failed
diff --git a/source4/kdc/mit-kdb/kdb_samba_policies.c b/source4/kdc/mit-kdb/kdb_samba_policies.c
index f1820e42835..4c68fae7abd 100644
--- a/source4/kdc/mit-kdb/kdb_samba_policies.c
+++ b/source4/kdc/mit-kdb/kdb_samba_policies.c
@@ -761,4 +761,4 @@ void kdb_samba_db_audit_as_req(krb5_context context,
 	samba_bad_password_count(client, error_code);
 
 	/* TODO: perform proper audit logging for addresses */
-}
\ No newline at end of file
+}
diff --git a/third_party/waf/update.sh b/third_party/waf/update.sh
index 95f57ed1d81..1983ab0ca6e 100755
--- a/third_party/waf/update.sh
+++ b/third_party/waf/update.sh
@@ -78,4 +78,4 @@ grep WAFVERSION "${WAF_SAMBA_DIR}/waflib/Context.py"
 grep HEXVERSION "${WAF_SAMBA_DIR}/waflib/Context.py"
 echo
 
-cleanup_and_exit 0
\ No newline at end of file
+cleanup_and_exit 0


-- 
Samba Shared Repository