Date: Sun, 2 Feb 2003 04:10:54 -0800 (PST) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24563 for review Message-ID: <200302021210.h12CAsqc046111@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24563 Change 24563 by des@des.at.des.thinksec.com on 2003/02/02 04:10:00 More debugging macros: ENTERI() (item type), ENTERN() (int), ENTERS() (string). Rename RETURNI() to RETURNN() for consistency. Affected files ... .. //depot/projects/openpam/lib/openpam_findenv.c#10 edit .. //depot/projects/openpam/lib/openpam_get_option.c#6 edit .. //depot/projects/openpam/lib/openpam_impl.h#20 edit .. //depot/projects/openpam/lib/openpam_set_option.c#7 edit .. //depot/projects/openpam/lib/pam_get_data.c#10 edit .. //depot/projects/openpam/lib/pam_get_item.c#15 edit .. //depot/projects/openpam/lib/pam_set_data.c#12 edit .. //depot/projects/openpam/lib/pam_set_item.c#17 edit Differences ... ==== //depot/projects/openpam/lib/openpam_findenv.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_findenv.c#9 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#10 $ */ #include <string.h> @@ -55,12 +55,12 @@ ENTER(); if (pamh == NULL) - RETURNI(-1); + RETURNN(-1); for (i = 0; i < pamh->env_count; ++i) if (strncmp(pamh->env[i], name, len) == 0 && pamh->env[i][len] == '=') - RETURNI(i); - RETURNI(-1); + RETURNN(i); + RETURNN(-1); } /* ==== //depot/projects/openpam/lib/openpam_get_option.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_get_option.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#6 $ */ #include <sys/param.h> @@ -57,7 +57,7 @@ size_t len; int i; - ENTER(); + ENTERS(option); if (pamh == NULL || pamh->current == NULL || option == NULL) RETURNS(NULL); cur = pamh->current; ==== //depot/projects/openpam/lib/openpam_impl.h#20 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#19 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#20 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -42,6 +42,7 @@ extern const char *_pam_func_name[PAM_NUM_PRIMITIVES]; extern const char *_pam_sm_func_name[PAM_NUM_PRIMITIVES]; extern const char *_pam_err_name[PAM_NUM_ERRORS]; +extern const char *_pam_item_name[PAM_NUM_ITEMS]; /* * Control flags @@ -123,6 +124,21 @@ #ifdef DEBUG #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") +#define ENTERI(i) do { \ + if ((i) > 0 && (i) < PAM_NUM_ITEMS) \ + openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[i]); \ + else \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", (i)); \ +} while (0); +#define ENTERN(n) do { \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", (n)); \ +} while (0); +#define ENTERS(s) do { \ + if ((s) == NULL) \ + openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \ + else \ + openpam_log(PAM_LOG_DEBUG, "entering: '%s'", (s)); \ +} while (0); #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ @@ -131,9 +147,9 @@ openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ return (c); \ } while (0) -#define RETURNI(i) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (i)); \ - return (i); \ +#define RETURNN(n) do { \ + openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ + return (n); \ } while (0) #define RETURNP(p) do { \ if ((p) == NULL) \ @@ -151,9 +167,12 @@ } while (0) #else #define ENTER() +#define ENTERI(i) +#define ENTERN(n) +#define ENTERS(s) #define RETURNV() return #define RETURNC(c) return (c) -#define RETURNI(i) return (i) +#define RETURNN(n) return (n) #define RETURNP(p) return (p) #define RETURNS(s) return (s) #endif ==== //depot/projects/openpam/lib/openpam_set_option.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_set_option.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#7 $ */ #include <sys/param.h> @@ -61,7 +61,7 @@ size_t len; int i; - ENTER(); + ENTERS(option); if (pamh == NULL || pamh->current == NULL || option == NULL) RETURNC(PAM_SYSTEM_ERR); cur = pamh->current; ==== //depot/projects/openpam/lib/pam_get_data.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_data.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_get_data.c#10 $ */ #include <string.h> @@ -54,7 +54,7 @@ { pam_data_t *dp; - ENTER(); + ENTERS(module_data_name); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) ==== //depot/projects/openpam/lib/pam_get_item.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_item.c#14 $ + * $P4: //depot/projects/openpam/lib/pam_get_item.c#15 $ */ #include <sys/param.h> @@ -40,6 +40,22 @@ #include "openpam_impl.h" +const char *_pam_item_name[PAM_NUM_ITEMS] = { + "(NO ITEM)", + "PAM_SERVICE", + "PAM_USER", + "PAM_TTY", + "PAM_RHOST", + "PAM_CONV", + "PAM_AUTHTOK", + "PAM_OLDAUTHTOK", + "PAM_RUSER", + "PAM_USER_PROMPT", + "PAM_REPOSITORY", + "PAM_AUTHTOK_PROMPT", + "PAM_OLDAUTHTOK_PROMPT" +}; + /* * XSSO 4.2.1 * XSSO 6 page 46 @@ -53,7 +69,7 @@ const void **item) { - ENTER(); + ENTERI(item_type); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); switch (item_type) { ==== //depot/projects/openpam/lib/pam_set_data.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_data.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_set_data.c#12 $ */ #include <stdlib.h> @@ -58,7 +58,7 @@ { pam_data_t *dp; - ENTER(); + ENTERS(module_data_name); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) { ==== //depot/projects/openpam/lib/pam_set_item.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_item.c#16 $ + * $P4: //depot/projects/openpam/lib/pam_set_item.c#17 $ */ #include <sys/param.h> @@ -58,7 +58,7 @@ void **slot, *tmp; size_t nsize, osize; - ENTER(); + ENTERI(item_type); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); slot = &pamh->item[item_type]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302021210.h12CAsqc046111>