summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2014-07-14 10:46:00 -0400
committerSteve Dickson <steved@redhat.com>2014-08-07 14:41:34 -0400
commit9246346e687746229e2bb70fc5f21c7dd1241085 (patch)
tree8a8afd871d97a30509a86d33f77e0afb77244542
parentdf0b7874d876249bc7c191a84c1eca4b494bf967 (diff)
downloadti-rpc-9246346e687746229e2bb70fc5f21c7dd1241085.tar.gz
key_call: Convert local debug() calls to LIBTIRPC_DEBUG() calls
Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--src/key_call.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/key_call.c b/src/key_call.c
index 906b2f6..8b9f388 100644
--- a/src/key_call.c
+++ b/src/key_call.c
@@ -59,16 +59,11 @@
#include <sys/wait.h>
#include <sys/fcntl.h>
+#include "dump.h"
#define KEY_TIMEOUT 5 /* per-try timeout in seconds */
#define KEY_NRETRY 12 /* number of retries */
-#ifdef DEBUG
-#define debug(msg) (void) fprintf(stderr, "%s\n", msg);
-#else
-#define debug(msg)
-#endif /* DEBUG */
-
/*
* Hack to allow the keyserver to use AUTH_DES (for authenticated
* NIS+ calls, for example). The only functions that get called
@@ -96,7 +91,7 @@ key_setsecret(secretkey)
return (-1);
}
if (status != KEY_SUCCESS) {
- debug("set status is nonzero");
+ LIBTIRPC_DEBUG(1, ("key_setsecret: set status is nonzero"));
return (-1);
}
return (0);
@@ -144,7 +139,7 @@ key_encryptsession_pk(remotename, remotekey, deskey)
return (-1);
}
if (res.status != KEY_SUCCESS) {
- debug("encrypt status is nonzero");
+ LIBTIRPC_DEBUG(1, ("key_encryptsession_pk: encrypt status is nonzero"));
return (-1);
}
*deskey = res.cryptkeyres_u.deskey;
@@ -168,7 +163,7 @@ key_decryptsession_pk(remotename, remotekey, deskey)
return (-1);
}
if (res.status != KEY_SUCCESS) {
- debug("decrypt status is nonzero");
+ LIBTIRPC_DEBUG(1, ("key_decryptsession_pk: decrypt status is nonzero"));
return (-1);
}
*deskey = res.cryptkeyres_u.deskey;
@@ -190,7 +185,7 @@ key_encryptsession(remotename, deskey)
return (-1);
}
if (res.status != KEY_SUCCESS) {
- debug("encrypt status is nonzero");
+ LIBTIRPC_DEBUG(1, ("key_encryptsession: encrypt status is nonzero"));
return (-1);
}
*deskey = res.cryptkeyres_u.deskey;
@@ -212,7 +207,7 @@ key_decryptsession(remotename, deskey)
return (-1);
}
if (res.status != KEY_SUCCESS) {
- debug("decrypt status is nonzero");
+ LIBTIRPC_DEBUG(1, ("key_decryptsession: decrypt status is nonzero"));
return (-1);
}
*deskey = res.cryptkeyres_u.deskey;
@@ -243,7 +238,7 @@ struct key_netstarg *arg;
}
if (status != KEY_SUCCESS) {
- debug("key_setnet status is nonzero");
+ LIBTIRPC_DEBUG(1, ("key_setnet: key_setnet status is nonzero"));
return (-1);
}
return (1);
@@ -262,7 +257,7 @@ key_get_conv(pkey, deskey)
return (-1);
}
if (res.status != KEY_SUCCESS) {
- debug("get_conv status is nonzero");
+ LIBTIRPC_DEBUG(1, ("key_get_conv: get_conv status is nonzero"));
return (-1);
}
*deskey = res.cryptkeyres_u.deskey;