fix irix compile errors - cannot initialize array in declaration statement

with non-const values - strsep not defined
(This used to be commit a5c59b2cd10016ecbd931531602ad1cb3660bbf9)

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 26724894829c2ffa2087f399904f081b0846fa40..f0c4ad9040cbec286bb3e2cbe5ef9ff4b745d16b 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -826,7 +826,11 @@ static ADS_STATUS ads_modlist_add(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 ADS_STATUS ads_mod_str(TALLOC_CTX *ctx, ADS_MODLIST *mods, 
                       const char *name, const char *val)
 {
-       const char *values[2] = {val, NULL};
+       const char *values[2];
+
+       values[0] = val;
+       values[1] = NULL;
+
        if (!val)
                return ads_modlist_add(ctx, mods, LDAP_MOD_DELETE, name, NULL);
        return ads_modlist_add(ctx, mods, LDAP_MOD_REPLACE, name, 
@@ -861,7 +865,10 @@ ADS_STATUS ads_mod_strlist(TALLOC_CTX *ctx, ADS_MODLIST *mods,
 static ADS_STATUS ads_mod_ber(TALLOC_CTX *ctx, ADS_MODLIST *mods, 
                              const char *name, const struct berval *val)
 {
-       const struct berval *values[2] = {val, NULL};
+       const struct berval *values[2];
+
+       values[0] = val;
+       values[1] = NULL;
        if (!val)
                return ads_modlist_add(ctx, mods, LDAP_MOD_DELETE, name, NULL);
        return ads_modlist_add(ctx, mods, LDAP_MOD_REPLACE|LDAP_MOD_BVALUES,

diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index d6605d08f56c92bcc8cd456ef7bc2ce34c217357..49de2e4a50ede8f6fa9f7e0123ca4b441a94684b 100644 (file)
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -334,7 +334,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
        /* Push domain components */
        dc = domain;
        q1 = q;
-       while ((component = strsep(&dc, "."))) {
+       while ((component = strtok(dc, "."))) {
          size = push_ascii(&q[1], component, -1, 0);
          SCVAL(q, 0, size);
          q += (size + 1);