[illumos-gate merge]

commit 4213c2d8f7d24a0383e863621115570a68fb016c
    8784 sasl_plugins: variable 'maj_stat' set but not used
commit 44d74681b047548dfbd9a7b3f4e269c98c3b393c
    8776 krb5kdc: right-hand operand of comma expression has no effect
commit 2f8bbd9dee64b0f32e2f0e385b450b0d7dca7e32
    8771 kadmin/kdcmgr: variable set but not used
commit 4f39e64d5650b95d43882032f7d084ea6dcf110b
    8759 pkgadm: variable set but not used

4 files changed, 11 insertions, 25 deletions

diff --git a/usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c b/usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c
index bee86b197a..e3e60820c3 100644
--- a/usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c
+++ b/usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c
@@ -52,7 +52,7 @@ main(int argc, char **argv)
 {
 	unsigned char answer[NS_MAXMSG], *ansp = NULL, *end, a, b, c, d;
 	int len = 0, anslen, hostlen, nq, na, type, class;
-	int ttl, priority, weight, port, size;
+	int ttl __unused, priority __unused, weight __unused, port, size;
 	char name[NS_MAXDNAME], *cp, *typestr = NULL;
 	char nbuf[INET6_ADDRSTRLEN];
 	struct __res_state stat;
diff --git a/usr/src/cmd/krb5/krb5kdc/network.c b/usr/src/cmd/krb5/krb5kdc/network.c
index fc16b38949..54b0c9531c 100644
--- a/usr/src/cmd/krb5/krb5kdc/network.c
+++ b/usr/src/cmd/krb5/krb5kdc/network.c
@@ -215,7 +215,7 @@ struct connection {
    : 0)
 
 #define DEL(set, idx) \
-  (set.data[idx] = set.data[--set.n], 0)
+  (set.data[idx] = set.data[--set.n])
 
 #define FREE_SET_DATA(set) if(set.data) free(set.data);                 \
    (set.data = 0, set.max = 0)
diff --git a/usr/src/cmd/svr4pkg/pkgadm/lock.c b/usr/src/cmd/svr4pkg/pkgadm/lock.c
index df0232ee8f..8e27c576aa 100644
--- a/usr/src/cmd/svr4pkg/pkgadm/lock.c
+++ b/usr/src/cmd/svr4pkg/pkgadm/lock.c
@@ -243,8 +243,6 @@ admin_lock(int argc, char **argv)
 	pid_t			pFlag = 0;	/* process # */
 	struct sigaction	nact;
 	struct sigaction	oact;
-	void			(*funcSighup)();
-	void			(*funcSigint)();
 	zoneid_t		zFlag = -1;	/* zone i.d. */
 
 	while ((c = getopt(argc, argv, ":aek:o:p:qrR:stwW:z:")) != EOF) {
@@ -509,23 +507,15 @@ admin_lock(int argc, char **argv)
 	nact.sa_flags = SA_RESTART;
 	(void) sigemptyset(&nact.sa_mask);
 
-	if (sigaction(SIGINT, &nact, &oact) < 0) {
-		funcSigint = SIG_DFL;
-	} else {
-		funcSigint = oact.sa_handler;
-	}
+	(void) sigaction(SIGINT, &nact, &oact);
 
-	/* connect sighupt_handler() to SIGHUP */
+	/* connect sighup_handler() to SIGHUP */
 
 	nact.sa_handler = sighup_handler;
 	nact.sa_flags = SA_RESTART;
 	(void) sigemptyset(&nact.sa_mask);
 
-	if (sigaction(SIGHUP, &nact, &oact) < 0) {
-		funcSighup = SIG_DFL;
-	} else {
-		funcSighup = oact.sa_handler;
-	}
+	(void) sigaction(SIGHUP, &nact, &oact);
 
 	/* release hold on signals */
 
@@ -1852,15 +1842,11 @@ static boolean_t
 _validateLock(int a_fd, LOCK_T *a_theLock, int a_quiet)
 {
 	ADMINLOCK_T	*pll;
-	char		*pld;
-	long		pls;
 	char		path[MAXPATHLEN];
 
 	/* localize references to lock object */
 
-	pld = &a_theLock->_lrLockData[0];
 	pll = &a_theLock->_lrLock;
-	pls = sizeof (a_theLock->_lrLockData);
 
 	/* return true if no process i.d. associated with lock */
 
diff --git a/usr/src/lib/sasl_plugins/gssapi/gssapi.c b/usr/src/lib/sasl_plugins/gssapi/gssapi.c
index 2b03caf706..d1c05f7577 100644
--- a/usr/src/lib/sasl_plugins/gssapi/gssapi.c
+++ b/usr/src/lib/sasl_plugins/gssapi/gssapi.c
@@ -644,33 +644,33 @@ static context_t *gss_new_context(const sasl_utils_t *utils)
 
 static void sasl_gss_free_context_contents(context_t *text)
 {
-    OM_uint32 maj_stat, min_stat;
+    OM_uint32 min_stat;
     
     if (!text) return;
     
     if (text->gss_ctx != GSS_C_NO_CONTEXT) {
-	maj_stat = gss_delete_sec_context (&min_stat,&text->gss_ctx,GSS_C_NO_BUFFER);
+	(void) gss_delete_sec_context(&min_stat,&text->gss_ctx,GSS_C_NO_BUFFER);
 	text->gss_ctx = GSS_C_NO_CONTEXT;
     }
     
     if (text->client_name != GSS_C_NO_NAME) {
-	maj_stat = gss_release_name(&min_stat,&text->client_name);
+	(void) gss_release_name(&min_stat,&text->client_name);
 	text->client_name = GSS_C_NO_NAME;
     }
     
     if (text->server_name != GSS_C_NO_NAME) {
-	maj_stat = gss_release_name(&min_stat,&text->server_name);
+	(void) gss_release_name(&min_stat,&text->server_name);
 	text->server_name = GSS_C_NO_NAME;
     }
     
     if ( text->server_creds != GSS_C_NO_CREDENTIAL) {
-	maj_stat = gss_release_cred(&min_stat, &text->server_creds);
+	(void) gss_release_cred(&min_stat, &text->server_creds);
 	text->server_creds = GSS_C_NO_CREDENTIAL;
     }
 
 #ifdef _SUN_SDK_
     if ( text->client_creds != GSS_C_NO_CREDENTIAL) {
-	maj_stat = gss_release_cred(&min_stat, &text->client_creds);
+	(void) gss_release_cred(&min_stat, &text->client_creds);
 	text->client_creds = GSS_C_NO_CREDENTIAL;
     }