Merge from HEAD - the usual popt-needs-static for Sun CC.

(This used to be commit 2fabc356769477cc8bdbb23ecd8fee1e7d9fdb7d)

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index c5d0aa869bf9f0eba12a89d0902e49d3d02cd34c..9c7379ca2a9c94837213afe270d02cda8fb6d1d8 100644 (file)
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -393,7 +393,7 @@ static struct cli_state *connect_one(const char *share)
        pstring set_str = {0};
        enum SMB_QUOTA_TYPE qtype;
        int cmd = 0;
-       BOOL test_args = False;
+       static BOOL test_args = False;
        struct cli_state *cli;
        BOOL fix_user = False;
        SMB_NTQUOTA_STRUCT qt;