Remove special-case call sequence for KAM_SetPassword on s390

For Linux s390 (but not s390x), an additional argument was passed
to KAM_SetPassword between the kvno and the encryption key.  This
doesn't seem to match the rest of the code and is now, with stricter
prototyping, preventing the code from compiling.  Remove it and use
the same call sequence on s390 as everywhere else.

Change-Id: I750f64212e80d4bed4500e316ad7d354608866d7
Reviewed-on: http://gerrit.openafs.org/1790
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit d80382efc5b0e3c8d32688a94c7ff7c68882cb59)

diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c
index adc7e3c3eed56a924c14250c8bb8512bf22a9854..4e6782f128e640bb8f7d0c47b40aa236693cd8a3 100644 (file)
--- a/src/kauth/admin_tools.c
+++ b/src/kauth/admin_tools.c
@@ -821,11 +821,7 @@ SetPassword(struct cmd_syndesc *as, void *arock)
     if (as->parms[3].items)
        sscanf(as->parms[3].items->data, "%d", &kvno);
 
-#if defined(AFS_S390_LINUX20_ENV) && !defined(AFS_S390X_LINUX20_ENV)
-    code = ubik_Call(KAM_SetPassword, conn, 0, name, instance, kvno, 0, key);
-#else
     code = ubik_Call(KAM_SetPassword, conn, 0, name, instance, kvno, key);
-#endif
     if (code)
        afs_com_err(whoami, code, "so can't set password for %s.%s", name,
                instance);

diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index 34e56a61ef4f219183c6fb83b2c2e55b96a6cb8d..3d262433a705cbe4c047d3b62013bdba213ff9a7 100644 (file)
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -783,13 +783,8 @@ ka_ChangePassword(char *name, char *instance, struct ubik_client * conn,   /* Ubik
     afs_int32 code;
 
     LOCK_GLOBAL_MUTEX;
-#if defined(AFS_S390_LINUX20_ENV) && !defined(AFS_S390X_LINUX20_ENV)
-    code =
-       ubik_KAM_SetPassword(conn, UBIK_CALL_NEW, name, instance, 0, 0, *(EncryptionKey *)newkey);
-#else
     code =
        ubik_KAM_SetPassword(conn, UBIK_CALL_NEW, name, instance, 0, *(EncryptionKey *)newkey);
-#endif
     UNLOCK_GLOBAL_MUTEX;
     return code;
 }