Browse code

fix for domainjoin in client only installs

Change-Id: I99434a21d0c5cecc5ae63f7c4887837f7fb932d4
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3284
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>

Priyesh Padmavilasom authored on 2017/07/19 09:50:53
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Name:          lightwave
2 2
 Summary:       VMware Lightwave
3 3
 Version:       1.2.1
4
-Release:       4%{?dist}
4
+Release:       5%{?dist}
5 5
 License:       Apache 2.0
6 6
 Group:         Applications/System
7 7
 Vendor:        VMware, Inc.
... ...
@@ -459,27 +459,6 @@ fi
459 459
 
460 460
     /bin/mkdir -m 755 -p %{_logdir}
461 461
 
462
-    # add libgssapi_srp.so to GSSAPI plugin directory
463
-    if [ ! -h %{_krb5_lib_dir}/gss/libgssapi_srp.so ]; then
464
-        /bin/ln -s %{_lib64dir}/libgssapi_srp.so %{_krb5_lib_dir}/gss/libgssapi_srp.so
465
-    fi
466
-
467
-    # Add GSSAPI SRP plugin configuration to GSS mech file
468
-    if [ -f %{_krb5_gss_conf_dir}/mech ]; then
469
-        if [ `grep -c  "1.2.840.113554.1.2.10" %{_krb5_gss_conf_dir}/mech` -lt 1 ]; then
470
-            echo "srp  1.2.840.113554.1.2.10 libgssapi_srp.so" >> %{_krb5_gss_conf_dir}/mech
471
-        fi
472
-    fi
473
-
474
-    # Restore commented out NTLM mech oid if found
475
-    if [ `grep -c  "#ntlm " %{_krb5_gss_conf_dir}/mech` -ge 1 ]; then
476
-        /bin/mv %{_krb5_gss_conf_dir}/mech %{_krb5_gss_conf_dir}/mech-$$
477
-        /bin/cat %{_krb5_gss_conf_dir}/mech-$$ | sed 's|^#ntlm|ntlm|' > %{_krb5_gss_conf_dir}/mech
478
-        if [ -s %{_krb5_gss_conf_dir}/mech ]; then
479
-            /bin/rm %{_krb5_gss_conf_dir}/mech-$$
480
-        fi
481
-    fi
482
-
483 462
     /bin/mkdir -m 700 -p %{_vmafd_dbdir}
484 463
     /bin/mkdir -m 700 -p %{_vecsdir}
485 464
     /bin/mkdir -m 700 -p %{_crlsdir}
... ...
@@ -511,6 +490,8 @@ fi
511 511
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmafd.reg
512 512
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdir-client.reg
513 513
                 %{_likewise_open_bindir}/lwregshell import %{_datadir}/config/vmdns-client.reg
514
+                %{_likewise_open_bindir}/lwsm -q refresh
515
+                sleep 2
514 516
             else
515 517
                 started_lwregd=false
516 518
                 if [ -z "`pidof lwregd`" ]; then
... ...
@@ -656,6 +637,28 @@ fi
656 656
             ;;
657 657
     esac
658 658
 
659
+%post client-libs
660
+    # add libgssapi_srp.so to GSSAPI plugin directory
661
+    if [ ! -h %{_krb5_lib_dir}/gss/libgssapi_srp.so ]; then
662
+        /bin/ln -s %{_lib64dir}/libgssapi_srp.so %{_krb5_lib_dir}/gss/libgssapi_srp.so
663
+    fi
664
+
665
+    # Add GSSAPI SRP plugin configuration to GSS mech file
666
+    if [ -f %{_krb5_gss_conf_dir}/mech ]; then
667
+        if [ `grep -c  "1.2.840.113554.1.2.10" %{_krb5_gss_conf_dir}/mech` -lt 1 ]; then
668
+            echo "srp  1.2.840.113554.1.2.10 libgssapi_srp.so" >> %{_krb5_gss_conf_dir}/mech
669
+        fi
670
+    fi
671
+
672
+    # Restore commented out NTLM mech oid if found
673
+    if [ `grep -c  "#ntlm " %{_krb5_gss_conf_dir}/mech` -ge 1 ]; then
674
+        /bin/mv %{_krb5_gss_conf_dir}/mech %{_krb5_gss_conf_dir}/mech-$$
675
+        /bin/cat %{_krb5_gss_conf_dir}/mech-$$ | sed 's|^#ntlm|ntlm|' > %{_krb5_gss_conf_dir}/mech
676
+        if [ -s %{_krb5_gss_conf_dir}/mech ]; then
677
+            /bin/rm %{_krb5_gss_conf_dir}/mech-$$
678
+        fi
679
+    fi
680
+
659 681
 %preun
660 682
 
661 683
     # First argument is 0 => Uninstall
... ...
@@ -750,20 +753,6 @@ fi
750 750
                 %{_likewise_open_bindir}/lwsm autostart
751 751
             fi
752 752
 
753
-            # Cleanup GSSAPI SRP symlink
754
-            if [ -h %{_krb5_lib_dir}/gss/libgssapi_srp.so ]; then
755
-                /bin/rm -f %{_krb5_lib_dir}/gss/libgssapi_srp.so
756
-            fi
757
-
758
-            # Remove GSSAPI SRP Plugin configuration from GSS mech file
759
-            if [ -f %{_krb5_gss_conf_dir}/mech ]; then
760
-                if [ `grep -c "1.2.840.113554.1.2.10" %{_krb5_gss_conf_dir}/mech` -gt 0 ]; then
761
-                    /bin/cat %{_krb5_gss_conf_dir}/mech | sed '/1.2.840.113554.1.2.10/d' > "/tmp/mech-$$"
762
-                    if [ -s /tmp/mech-$$ ]; then
763
-                        /bin/mv "/tmp/mech-$$" %{_krb5_gss_conf_dir}/mech
764
-                    fi
765
-                fi
766
-            fi
767 753
 
768 754
             if [ -h %{_logconfdir}/vmafdd-syslog-ng.conf ]; then
769 755
                 /bin/rm -f %{_logconfdir}/vmafdd-syslog-ng.conf
... ...
@@ -803,6 +792,39 @@ fi
803 803
             ;;
804 804
     esac
805 805
 
806
+%preun client-libs
807
+
808
+    # First argument is 0 => Uninstall
809
+    # First argument is 1 => Upgrade
810
+
811
+    case "$1" in
812
+        0)
813
+            #
814
+            # Uninstall
815
+            #
816
+            # Cleanup GSSAPI SRP symlink
817
+            if [ -h %{_krb5_lib_dir}/gss/libgssapi_srp.so ]; then
818
+                /bin/rm -f %{_krb5_lib_dir}/gss/libgssapi_srp.so
819
+            fi
820
+
821
+            # Remove GSSAPI SRP Plugin configuration from GSS mech file
822
+            if [ -f %{_krb5_gss_conf_dir}/mech ]; then
823
+                if [ `grep -c "1.2.840.113554.1.2.10" %{_krb5_gss_conf_dir}/mech` -gt 0 ]; then
824
+                    /bin/cat %{_krb5_gss_conf_dir}/mech | sed '/1.2.840.113554.1.2.10/d' > "/tmp/mech-$$"
825
+                    if [ -s /tmp/mech-$$ ]; then
826
+                        /bin/mv "/tmp/mech-$$" %{_krb5_gss_conf_dir}/mech
827
+                    fi
828
+                fi
829
+            fi
830
+            ;;
831
+
832
+        1)
833
+            #
834
+            # Upgrade
835
+            #
836
+            ;;
837
+    esac
838
+
806 839
 %postun
807 840
 
808 841
     # First argument is 0 => Uninstall
... ...
@@ -1120,6 +1142,9 @@ fi
1120 1120
 # %doc ChangeLog README COPYING
1121 1121
 
1122 1122
 %changelog
1123
+*   Tue Jul 18 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.1-5
1124
+-   making sure client-libs install gss mechs
1125
+-   make sure domainjoin works with just client installed.
1123 1126
 *   Mon Jul 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.2.1-4
1124 1127
 -   Updated the commons-daemon directory path to its new location
1125 1128
 *   Tue Jun 20 2017 Divya Thaluru <dthaluru@vmware.com> 1.2.1-3