From: Michael Meffie <mmeffie@sinenomine.net>
Date: Wed, 17 Jul 2013 22:10:42 +0000 (+0100)
Subject: ubik: Fix encryption selection in ugen
X-Git-Tag: debian/1.4.12.1+dfsg-4+squeeze2~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=026c8cbed086e14d53a529aaa42a752c6f04ecf9;p=packages%2Fo%2Fopenafs.git

ubik: Fix encryption selection in ugen

Make sure that we encrypt when requested to by the application

Change-Id: Ib2e1292993a0be113f0c95ef1a7b0e79a273798d
---

diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c
index 45a7216f1..d7e9c6cff 100644
--- a/src/ubik/uinit.c
+++ b/src/ubik/uinit.c
@@ -77,7 +77,11 @@ ugen_ClientInit(int noAuthFlag, char *confDir, char *cellName, afs_int32 sauth,
 		    funcName, AFSDIR_SERVER_ETC_DIRPATH);
 	    return -1;
 	}
-	code = afsconf_ClientAuth(tdir, &sc, &scIndex);	/* sets sc,scIndex */
+	if (gen_rxkad_level == rxkad_crypt) { /* -encrypt */
+	    code = afsconf_ClientAuthSecure(tdir, &sc, &scIndex);
+	} else {
+	    code = afsconf_ClientAuth(tdir, &sc, &scIndex);	/* sets sc,scIndex */
+	}
 	if (code) {
 	    afsconf_Close(tdir);
 	    fprintf(stderr,