2011-07-04 Michal Pryc <Michal.Pryc@Oracle.Com>

	* common/nwam-scf.c:
	* common/nwam-scf.h:
	* common/nwamui_daemon.c:
	 Compability change to allow build those sources on the
	 Source Juicer builds clients prior to 170. - FOLLOW-UP



git-svn-id: file:///export/mirror/svn/svn.opensolaris.org/svn/jds/nwam-manager/trunk@704 6b7d1fb9-75dd-c4d7-8f26-8a8fef618664

ChangeLog

@@ -1,3 +1,11 @@
+2011-07-04  Michal Pryc <Michal.Pryc@Oracle.Com>
+
+	* common/nwam-scf.c:
+	* common/nwam-scf.h:
+	* common/nwamui_daemon.c:
+	 Compability change to allow build those sources on the
+	 Source Juicer builds clients prior to 170. - FOLLOW-UP
+
 2011-07-01  Michal Pryc <Michal.Pryc@Oracle.Com>
 
 	* common/nwam-scf.c:

common/nwam-scf.c

@@ -135,7 +135,7 @@ get_active_ncp(char *namestr, size_t namelen, scf_error_t *serr)
 	int		rtn = -1;
 	scf_resources_t	res;
 
-	if (get_property_value(NWAM_FMRI, NWAM_NETCFG_PG,
+	if (get_property_value(NWAMUI_FMRI, NWAM_NETCFG_PG,
 	    NWAM_NETCFG_ACTIVE_NCP_PROP, B_TRUE, &res, serr) != 0)
 		return (-1);
 

common/nwam-scf.h

@@ -33,9 +33,7 @@
 
 // The below functions should be used directly from the
 // minilander "libnwam.h", but it's not yet available. 
-#ifndef NWAM_FMRI
-#define	NWAM_FMRI	"svc:/network/physical:default"
-#endif /* NWAM_FMRI */
+#define	NWAMUI_FMRI	"svc:/network/physical:default"
 #define	NWAM_NETCFG_PG		"netcfg"
 #define	NWAM_NETCFG_ACTIVE_NCP_PROP	"active_ncp"
 #define	NWAM_NCP_NAME_DEF_FIXED	"DefaultFixed"

common/nwamui_daemon.c

@@ -2482,7 +2482,7 @@ nwamui_is_nwam_enabled ( void )
     char                activencp[NWAM_MAX_NAME_LEN];
     scf_error_t         serr;    
 
-    smf_state = smf_get_state(NWAM_FMRI);
+    smf_state = smf_get_state(NWAMUI_FMRI);
 
     if (strcmp(smf_state, SCF_STATE_STRING_ONLINE) != 0) {
         g_debug("%s: NWAM service appears to be off-line", __func__);