From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 19 Nov 2001 18:32:44 +0000 (+0000)
Subject: 	* kadm_server.h: Update prototype for convert_kadm5_to_kadm
X-Git-Tag: krb5-1.3-alpha1~948
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcf8655d20f1953916e98aac54ec4b30fff72870;p=krb5.git

	* kadm_server.h: Update prototype for convert_kadm5_to_kadm

	* admin_server.c (process_client): Do not assign negative value to
	unsigned variable.
	(convert_kadm5_to_kadm): Return krb5_int32 instead of krb5_ui_4 to
	be compatible with error codes.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13993 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 293881c75..a21170680 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-19  Ezra Peisach  <epeisach@mit.edu>
+
+	* kadm_server.h: Update prototype for convert_kadm5_to_kadm.
+
+	* admin_server.c (process_client): Do not assign negative value to
+	unsigned variable.
+	(convert_kadm5_to_kadm): Return krb5_int32 instead of krb5_ui_4 to
+	be compatible with error codes.
+
 2001-07-09  Ezra Peisach  <epeisach@mit.edu>
 
 	* admin_server.c: Provide prototype for do_child and declare static.
diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c
index 84b1ef20d..8aaf0888f 100644
--- a/src/kadmin/v4server/admin_server.c
+++ b/src/kadmin/v4server/admin_server.c
@@ -466,7 +466,7 @@ static void process_client(fd, who)
     /* ugh... clean this up later */
     if (status == KRB5_KDB_DB_INUSE) {
 	/* db locked */
-	krb5_ui_4 retcode = KADM_DB_INUSE;
+	krb5_ui_4 retcode;
 	char *pdat;
 	
 	dat_len = KADM_VERSIZE + sizeof(krb5_ui_4);
@@ -661,8 +661,8 @@ kill_children()
 }
 
 #ifdef KADM5
-krb5_ui_4 convert_kadm5_to_kadm(val)
-   krb5_ui_4 val;
+krb5_int32 convert_kadm5_to_kadm(val)
+   krb5_int32 val;
 {
      switch (val) {
      case KADM5_AUTH_GET:
diff --git a/src/kadmin/v4server/kadm_server.h b/src/kadmin/v4server/kadm_server.h
index 647637385..45007b4ac 100644
--- a/src/kadmin/v4server/kadm_server.h
+++ b/src/kadmin/v4server/kadm_server.h
@@ -116,7 +116,7 @@ int acl_initialize(char *, int);
 
 /* admin_server.c */
 #ifdef KADM5
-krb5_ui_4 convert_kadm5_to_kadm(krb5_ui_4);
+krb5_int32 convert_kadm5_to_kadm(krb5_int32);
 #endif
 
 #endif /* KADM_SERVER_DEFS */