summaryrefslogtreecommitdiff
path: root/usr/src/lib/krb5
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/krb5')
-rw-r--r--usr/src/lib/krb5/kadm5/clnt/changepw.c9
-rw-r--r--usr/src/lib/krb5/kadm5/srv/server_acl.h18
-rw-r--r--usr/src/lib/krb5/kadm5/str_conv.c4
-rw-r--r--usr/src/lib/krb5/kdb/kdb_db2.c12
-rw-r--r--usr/src/lib/krb5/kdb/kdb_db2.h56
5 files changed, 50 insertions, 49 deletions
diff --git a/usr/src/lib/krb5/kadm5/clnt/changepw.c b/usr/src/lib/krb5/kadm5/clnt/changepw.c
index b5b4099d8b..48d4d130aa 100644
--- a/usr/src/lib/krb5/kadm5/clnt/changepw.c
+++ b/usr/src/lib/krb5/kadm5/clnt/changepw.c
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1998-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -80,9 +80,10 @@ _kadm5_get_kpasswd_protocol(void *handle)
* non-SEAM servers which support the Marc Horowitz defined
* protocol (1998) for password changing.
*
+ * SUNW14resync - added _local as it conflicts with one in krb5.h
*/
static krb5_error_code
-krb5_change_password(context, params, creds, newpw, srvr_rsp_code,
+krb5_change_password_local(context, params, creds, newpw, srvr_rsp_code,
srvr_msg)
krb5_context context;
kadm5_config_params *params;
@@ -426,7 +427,7 @@ kadm5_chpass_principal_v2(void *server_handle,
}
/* Now we have all we need to make the change request. */
- result = krb5_change_password(handle->context, &handle->params,
+ result = krb5_change_password_local(handle->context, &handle->params,
&ncreds, newpw,
srvr_rsp_code,
srvr_msg);
diff --git a/usr/src/lib/krb5/kadm5/srv/server_acl.h b/usr/src/lib/krb5/kadm5/srv/server_acl.h
index fef30e5277..756c3d7b4a 100644
--- a/usr/src/lib/krb5/kadm5/srv/server_acl.h
+++ b/usr/src/lib/krb5/kadm5/srv/server_acl.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -119,23 +119,23 @@ typedef struct _restriction {
} restriction_t;
krb5_error_code acl_init
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
int,
- char *));
+ char *);
void acl_finish
- KRB5_PROTOTYPE((krb5_context,
- int));
+ (krb5_context,
+ int);
krb5_boolean acl_check
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
gss_name_t,
krb5_int32,
krb5_principal,
- restriction_t **));
+ restriction_t **);
krb5_error_code acl_impose_restrictions
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
kadm5_principal_ent_rec *,
long *,
- restriction_t *));
+ restriction_t *);
#ifdef __cplusplus
}
#endif
diff --git a/usr/src/lib/krb5/kadm5/str_conv.c b/usr/src/lib/krb5/kadm5/str_conv.c
index 0a5f7474fe..9e81c46194 100644
--- a/usr/src/lib/krb5/kadm5/str_conv.c
+++ b/usr/src/lib/krb5/kadm5/str_conv.c
@@ -420,8 +420,8 @@ krb5_keysalt_iterate(ksaltlist, nksalt, ignoresalt, iterator, arg)
krb5_key_salt_tuple *ksaltlist;
krb5_int32 nksalt;
krb5_boolean ignoresalt;
- krb5_error_code (*iterator) KRB5_NPROTOTYPE((krb5_key_salt_tuple *,
- krb5_pointer));
+ krb5_error_code (*iterator) (krb5_key_salt_tuple *,
+ krb5_pointer);
krb5_pointer arg;
{
int i;
diff --git a/usr/src/lib/krb5/kdb/kdb_db2.c b/usr/src/lib/krb5/kdb/kdb_db2.c
index 351d600a7c..3697d7bbc8 100644
--- a/usr/src/lib/krb5/kdb/kdb_db2.c
+++ b/usr/src/lib/krb5/kdb/kdb_db2.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -78,13 +78,13 @@
#include "kdb_db2.h"
static char *gen_dbsuffix
- PROTOTYPE((char *, char * ));
+ (char *, char * );
static krb5_error_code krb5_db2_db_start_update
- PROTOTYPE((krb5_context));
+ (krb5_context);
static krb5_error_code krb5_db2_db_end_update
- PROTOTYPE((krb5_context));
+ (krb5_context);
static krb5_error_code krb5_db2_db_set_hashfirst
- PROTOTYPE((krb5_context, int));
+ (krb5_context, int);
static char default_db_name[] = DEFAULT_KDB_FILE;
@@ -1219,7 +1219,7 @@ cleanup:
krb5_error_code
krb5_db2_db_iterate (context, func, func_arg)
krb5_context context;
- krb5_error_code (*func) PROTOTYPE((krb5_pointer, krb5_db_entry *));
+ krb5_error_code (*func) (krb5_pointer, krb5_db_entry *);
krb5_pointer func_arg;
{
krb5_db2_context *db_ctx;
diff --git a/usr/src/lib/krb5/kdb/kdb_db2.h b/usr/src/lib/krb5/kdb/kdb_db2.h
index ec577edca5..bc0c690dae 100644
--- a/usr/src/lib/krb5/kdb/kdb_db2.h
+++ b/usr/src/lib/krb5/kdb/kdb_db2.h
@@ -70,56 +70,56 @@ typedef struct _krb5_db2_context {
#define KDB2_LOCK_EXT ".ok"
krb5_error_code krb5_db2_db_set_name
- KRB5_PROTOTYPE((krb5_context,
- char * ));
+ (krb5_context,
+ char * );
krb5_error_code krb5_db2_db_init
- KRB5_PROTOTYPE((krb5_context));
+ (krb5_context);
krb5_error_code krb5_db2_db_fini
- KRB5_PROTOTYPE((krb5_context));
+ (krb5_context);
krb5_error_code krb5_db2_db_get_age
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
char *,
- time_t * ));
+ time_t * );
krb5_error_code krb5_db2_db_create
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
char *,
- krb5_int32));
+ krb5_int32);
krb5_error_code krb5_db2_db_destroy
- KRB5_PROTOTYPE((krb5_context,
- char * ));
+ (krb5_context,
+ char * );
krb5_error_code krb5_db2_db_rename
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
char *,
- char * ));
+ char * );
krb5_error_code krb5_db2_db_get_principal
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
krb5_const_principal,
krb5_db_entry *,
int *,
- krb5_boolean * ));
+ krb5_boolean * );
void krb5_db2_db_free_principal
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
krb5_db_entry *,
- int ));
+ int );
krb5_error_code krb5_db2_db_put_principal
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
krb5_db_entry *,
- int * ));
+ int * );
krb5_error_code krb5_db2_db_iterate
- KRB5_PROTOTYPE((krb5_context,
- krb5_error_code (*) KRB5_PROTOTYPE((krb5_pointer,
- krb5_db_entry *)),
- krb5_pointer ));
+ (krb5_context,
+ krb5_error_code (*) (krb5_pointer,
+ krb5_db_entry *),
+ krb5_pointer );
krb5_error_code krb5_db2_db_set_nonblocking
- KRB5_PROTOTYPE((krb5_context,
+ (krb5_context,
krb5_boolean,
- krb5_boolean * ));
+ krb5_boolean * );
krb5_boolean krb5_db2_db_set_lockmode
- KRB5_PROTOTYPE((krb5_context,
- krb5_boolean ));
+ (krb5_context,
+ krb5_boolean );
krb5_error_code krb5_db2_db_open_database
- KRB5_PROTOTYPE((krb5_context));
+ (krb5_context);
krb5_error_code krb5_db2_db_close_database
- KRB5_PROTOTYPE((krb5_context));
+ (krb5_context);
#endif /* KRB5_KDB_DB2_H */