diff options
| author | Henry B. Hotz <hotz@jpl.nasa.gov> | 2012-06-04 10:56:38 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2012-07-23 16:04:12 -0400 |
| commit | e5578f06f744ab4779074d0c1ba46bdee1b2a23c (patch) | |
| tree | 231047c91443283682c42e77005261f0201a34ea | |
| parent | 2abad7f3c1bdcf545cc53559816bd975594892b2 (diff) | |
| download | krb5-e5578f06f744ab4779074d0c1ba46bdee1b2a23c.zip krb5-e5578f06f744ab4779074d0c1ba46bdee1b2a23c.tar.gz krb5-e5578f06f744ab4779074d0c1ba46bdee1b2a23c.tar.bz2 | |
Fix -DDEBUG compilation errors
(cherry picked from commit 7c3ecf5c77e33f6d04d6226b041071c6ce23b062)
ticket: 7150
version_fixed: 1.10.3
status: resolved
| -rw-r--r-- | src/appl/simple/server/sim_server.c | 1 | ||||
| -rw-r--r-- | src/lib/gssapi/spnego/gssapiP_spnego.h | 1 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/server_acl.c | 4 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/server_acl.h | 2 | ||||
| -rw-r--r-- | src/plugins/kdb/db2/libdb2/hash/hash_debug.c | 1 |
5 files changed, 6 insertions, 3 deletions
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c index 0f8d106..19d8f5f 100644 --- a/src/appl/simple/server/sim_server.c +++ b/src/appl/simple/server/sim_server.c @@ -41,6 +41,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> +#include <arpa/inet.h> #include "com_err.h" diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h index 3fe9fca..084716d 100644 --- a/src/lib/gssapi/spnego/gssapiP_spnego.h +++ b/src/lib/gssapi/spnego/gssapiP_spnego.h @@ -118,6 +118,7 @@ extern const gss_OID_desc * const gss_mech_spnego; extern const gss_OID_set_desc * const gss_mech_set_spnego; #ifdef DEBUG +#include <syslog.h> #define dsyslog(a) syslog(LOG_DEBUG, a) #else #define dsyslog(a) diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c index 17d4992..7094f49 100644 --- a/src/lib/kadm5/srv/server_acl.c +++ b/src/lib/kadm5/srv/server_acl.c @@ -568,7 +568,7 @@ kadm5int_acl_match_data(e1, e2, targetflag, ws) if (ws && !targetflag) { if (ws->nwild >= 9) { DPRINT(DEBUG_ACL, acl_debug_level, - ("Too many wildcards in ACL entry %s\n", entry->ae_name)); + ("Too many wildcards in ACL entry.\n")); } else ws->backref[ws->nwild++] = e2; @@ -579,7 +579,7 @@ kadm5int_acl_match_data(e1, e2, targetflag, ws) int n = e1->data[1] - '1'; if (n >= ws->nwild) { DPRINT(DEBUG_ACL, acl_debug_level, - ("Too many backrefs in ACL entry %s\n", entry->ae_name)); + ("Too many backrefs in ACL entry.\n")); } else if ((ws->backref[n]->length == e2->length) && (!strncmp(ws->backref[n]->data, e2->data, e2->length))) diff --git a/src/lib/kadm5/srv/server_acl.h b/src/lib/kadm5/srv/server_acl.h index 1ca4dfa..d492ea9 100644 --- a/src/lib/kadm5/srv/server_acl.h +++ b/src/lib/kadm5/srv/server_acl.h @@ -40,7 +40,7 @@ #define DEBUG_CALLS 128 #define DEBUG_NOSLAVES 256 #ifdef DEBUG -#define DPRINT(l1, cl, al) if ((cl & l1) != 0) xprintf al +#define DPRINT(l1, cl, al) if ((cl & l1) != 0) printf al #else /* DEBUG */ #define DPRINT(l1, cl, al) #endif /* DEBUG */ diff --git a/src/plugins/kdb/db2/libdb2/hash/hash_debug.c b/src/plugins/kdb/db2/libdb2/hash/hash_debug.c index 69229fc..43f537f 100644 --- a/src/plugins/kdb/db2/libdb2/hash/hash_debug.c +++ b/src/plugins/kdb/db2/libdb2/hash/hash_debug.c @@ -51,6 +51,7 @@ static char sccsid[] = "@(#)hash_debug.c 8.4 (Berkeley) 11/7/95"; * __dump_bucket */ #include <stdio.h> +#include <string.h> #include "db-int.h" #include "hash.h" |