(merge from 3.0)

Add static, and assert that we will never overflow the static fstring
in pdb_encode_acct_ctrl()  (All current callers are fine)

Andrew Bartlett
(This used to be commit badf7f64fb38dfd40bdf65b19e9dd8932d5e6c3b)

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 52dee801ad1ee1f64903b8a610c91d4b8587bb71..d45450a4fdef476b6bcddeb60c5651569ada9665 100644 (file)
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -412,7 +412,7 @@ NTSTATUS pdb_free_sam(SAM_ACCOUNT **user)
  *                                                                     SSS
  ***************************************************************************/
 
-NTSTATUS pdb_set_sam_sids(SAM_ACCOUNT *account_data, const struct passwd *pwd)
+static NTSTATUS pdb_set_sam_sids(SAM_ACCOUNT *account_data, const struct passwd *pwd)
 {
        const char *guest_account = lp_guestaccount();
        GROUP_MAP map;
@@ -475,6 +475,9 @@ NTSTATUS pdb_set_sam_sids(SAM_ACCOUNT *account_data, const struct passwd *pwd)
 char *pdb_encode_acct_ctrl(uint16 acct_ctrl, size_t length)
 {
        static fstring acct_str;
+
+       SMB_ASSERT(length <= sizeof(acct_str));
+
        size_t i = 0;
 
        acct_str[i++] = '[';