Version 1.3.1.

Merge remote-tracking branch 'origin/dev' Change-Id: Ic18ee060280904518fa1ff0b1f602b923f7a93bd
vmware-archive · Aug 9, 2017 · e9285f2 · e9285f2
2 parents 2c3cd19 + c57a50c
commit e9285f2
Show file tree

Hide file tree

Showing 130 changed files with 3,436 additions and 2,060 deletions.
diff --git a/build/package/rpm/lightwave.spec b/build/package/rpm/lightwave.spec
@@ -416,9 +416,9 @@ Lightwave POST service
                     started_lwregd=true
                     sleep 5
                 fi
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdir.reg
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdns.reg
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmca.reg
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmdir.reg
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmdns.reg
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmca.reg
                 if [ $started_lwregd = true ]; then
                     kill -TERM `pidof lwregd`
                     wait
@@ -496,6 +496,7 @@ Lightwave POST service
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmafd.reg
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdir-client.reg
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdns-client.reg
+                %{_likewise_open_bindir}/lwsm -q refresh
             else
                 started_lwregd=false
                 if [ -z "`pidof lwregd`" ]; then
@@ -533,16 +534,19 @@ Lightwave POST service
                 %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmafd.reg
                 %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmdir-client.reg
                 %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmdns-client.reg
+                %{_likewise_open_bindir}/lwsm -q refresh
+                sleep 5
+            else
                 started_lwregd=false
                 if [ -z "`pidof lwregd`" ]; then
                     echo "Starting lwregd"
                     %{_likewise_open_sbindir}/lwregd &
                     started_lwregd=true
                     sleep 5
                 fi
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmafd.reg
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdir-client.reg
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdns-client.reg
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmafd.reg
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmdir-client.reg
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/vmdns-client.reg
                 if [ $started_lwregd = true ]; then
                     kill `pidof lwregd`
                     wait
@@ -623,7 +627,7 @@ Lightwave POST service
             if [ $try_starting_lwregd_svc = true ]; then
                 %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/post.reg
                 %{_likewise_open_bindir}/lwsm -q refresh
-                sleep 2
+                sleep 5
             else
                 started_lwregd=false
                 if [ -z "`pidof lwregd`" ]; then
@@ -632,7 +636,7 @@ Lightwave POST service
                     started_lwregd=true
                     sleep 5
                 fi
-                %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/post.reg
+                %{_likewise_open_bindir}/lwregshell upgrade %{_datadir}/config/post.reg
                 if [ $started_lwregd = true ]; then
                     kill -TERM `pidof lwregd`
                     wait
@@ -953,7 +957,7 @@ Lightwave POST service
 %{_jarsdir}/openidconnect-protocol.jar
 %{_jarsdir}/openidconnect-server.jar
 %{_jarsdir}/commons-lang-2.6.jar
-%{_jarsdir}/commons-logging-1.1.1.jar
+%{_jarsdir}/commons-logging-1.2.jar
 %{_jarsdir}/jna-4.2.1.jar
 %{_jarsdir}/httpclient-4.5.1.jar
 %{_jarsdir}/slf4j-api-1.7.25.jar

diff --git a/config/cfgutils/cfgutils.c b/config/cfgutils/cfgutils.c
@@ -667,20 +667,6 @@ VmwDeploySetupClient(
         BAIL_ON_DEPLOY_ERROR(dwError);
     }
 
-    pszUsername = (pParams->bUseMachineAccount && pParams->pszMachineAccount)
-                            ? pParams->pszMachineAccount : VMW_ADMIN_NAME;
-
-    VMW_DEPLOY_LOG_INFO(
-            "Validating Domain credentials for user [%s@%s]",
-            VMW_DEPLOY_SAFE_LOG_STRING(pszUsername),
-            VMW_DEPLOY_SAFE_LOG_STRING(pParams->pszDomainName));
-
-    dwError = VmAfdJoinValidateDomainCredentialsA(
-                    pParams->pszDomainName,
-                    pszUsername,
-                    pParams->pszPassword);
-    BAIL_ON_DEPLOY_ERROR(dwError);
-
     if (pParams->bDisableAfdListener)
     {
         VMW_DEPLOY_LOG_INFO("Disabling AFD Listener");
@@ -704,6 +690,20 @@ VmwDeploySetupClient(
         BAIL_ON_DEPLOY_ERROR(dwError);
     }
 
+    pszUsername = (pParams->bUseMachineAccount && pParams->pszMachineAccount)
+                            ? pParams->pszMachineAccount : VMW_ADMIN_NAME;
+
+    VMW_DEPLOY_LOG_INFO(
+            "Validating Domain credentials for user [%s@%s]",
+            VMW_DEPLOY_SAFE_LOG_STRING(pszUsername),
+            VMW_DEPLOY_SAFE_LOG_STRING(pParams->pszDomainName));
+
+    dwError = VmAfdJoinValidateDomainCredentialsA(
+                    pParams->pszDomainName,
+                    pszUsername,
+                    pParams->pszPassword);
+    BAIL_ON_DEPLOY_ERROR(dwError);
+
     VMW_DEPLOY_LOG_INFO("Setting configuration values");
 
     dwError = VmAfdSetCAPathA(pszHostname, VMW_DEFAULT_CA_PATH);

diff --git a/config/scripts/configure-lightwave-server.in b/config/scripts/configure-lightwave-server.in
@@ -2,12 +2,12 @@
 
 LW_BIN_DIR=/opt/likewise/bin
 LW_SBIN_DIR=/opt/likewise/sbin
-LW_DEFAULT_VERSION="1.2.0"
+LW_DEFAULT_VERSION="1.3.0"
 LW_KEY="[HKEY_THIS_MACHINE\\Services\\lw-server]"
 
 _get_lw_version(){
 
-    LW_VERSION=`rpm -qid vmware-lightwave-server | grep -i Version | cut -d ':' -f2 | tr -d '[[:space:]]'`
+    LW_VERSION=`rpm -qid lightwave-server | grep -i Version | cut -d ':' -f2 | tr -d '[[:space:]]'`
 
     if [ -z $LW_VERSION ]; then
         LW_VERSION=$LW_DEFAULT_VERSION
@@ -366,10 +366,19 @@ else
 
     case "$LOTUS_DEPLOYMENT" in
         "standalone")
-            $BIN_DIR/ic-promote --domain $LOTUS_DOMAIN_DEFAULT --password "$LOTUS_ADMIN_PASSWORD_DEFAULT" --site $LOTUS_SITE_NAME
+            $BIN_DIR/ic-promote \
+                --domain $LOTUS_DOMAIN_DEFAULT \
+                --password "$LOTUS_ADMIN_PASSWORD_DEFAULT" \
+                --site $LOTUS_SITE_NAME \
+                $LOTUS_SSL_SUBJECT_ALT_NAME_ARG
             ;;
         "partner")
-            $BIN_DIR/ic-promote --domain $LOTUS_DOMAIN_DEFAULT --password "$LOTUS_ADMIN_PASSWORD_DEFAULT" --site $LOTUS_SITE_NAME --partner $LOTUS_PARTNER_HOSTNAME
+            $BIN_DIR/ic-promote \
+                --domain $LOTUS_DOMAIN_DEFAULT \
+                --password "$LOTUS_ADMIN_PASSWORD_DEFAULT" \
+                --site $LOTUS_SITE_NAME \
+                --partner $LOTUS_PARTNER_HOSTNAME \
+                $LOTUS_SSL_SUBJECT_ALT_NAME_ARG
             ;;
     esac
 
@@ -381,7 +390,7 @@ else
 case $DISABLE_STS in
     0)
         echo "Secure Token Service Installation - Started"
-	$BIN_DIR/configure-sts --domain $LOTUS_DOMAIN_DEFAULT  --password "$LOTUS_ADMIN_PASSWORD_DEFAULT"        
+	$BIN_DIR/configure-sts --domain $LOTUS_DOMAIN_DEFAULT  --password "$LOTUS_ADMIN_PASSWORD_DEFAULT"
         if [ $? -ne 0 ]; then
             echo "Secure Token Service Installation - Failed"
             _exit 1

diff --git a/lwraft/client/client.c b/lwraft/client/client.c
@@ -134,7 +134,7 @@ VmDirRaftAppendEntries(
                              int entriesSize,
     /* [in] */               unsigned char *entries,
     /* [out] */              UINT32 * currentTerm,
-    /* [out] */              UINT32 * status
+    /* [out] */              unsigned long long *status
     );
 
 /*
@@ -4891,18 +4891,18 @@ VmDirRaftAppendEntries(
                              int entriesSize,
     /* [in] */               unsigned char *entries,
     /* [out] */              UINT32 * currentTerm,
-    /* [out] */              UINT32 * status
+    /* [out] */              unsigned long long *status
     )
 {
     DWORD dwError = 0;
     UINT32 iCurrentTerm = 0;
-    UINT32 iStatus = 0;
+    idl_uhyper_int iStatus = 0;
     chglog_container chglogEntries = {0};
     chglogEntries.chglog_size = entriesSize;
     chglogEntries.chglog_bytes = entries;
 
     *currentTerm = 0;
-    *status = 1;
+    *status = 0;
 
     VMDIR_RPC_TRY
     {