From ffef23d40f100ba678bc2af73eb24bc6fc93356e Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Fri, 15 Jul 2011 15:35:18 +0200 Subject: [PATCH] s3:lib/afs use stdbool types --- source3/lib/afs.c | 10 +++++----- source3/lib/afs_settoken.c | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/source3/lib/afs.c b/source3/lib/afs.c index 2ee1747a77..849e9ce55d 100644 --- a/source3/lib/afs.c +++ b/source3/lib/afs.c @@ -93,11 +93,11 @@ static bool afs_createtoken(const char *username, const char *cell, des_key_schedule key_schedule; if (!secrets_init()) - return False; + return false; if (!secrets_fetch_afs_key(cell, &key)) { DEBUG(1, ("Could not fetch AFS service key\n")); - return False; + return false; } ct->AuthHandle = key.kvno; @@ -184,7 +184,7 @@ static bool afs_createtoken(const char *username, const char *cell, *ticket = data_blob(clear_ticket, len); - return True; + return true; } char *afs_createtoken_str(const char *username, const char *cell) @@ -276,7 +276,7 @@ bool afs_login(connection_struct *conn) afs_username, cell)); if (!afs_createtoken(afs_username, cell, &ticket, &ct)) - return False; + return false; /* For which Unix-UID do we want to set the token? */ ct.ViceId = getuid(); @@ -296,7 +296,7 @@ bool afs_login(connection_struct *conn) bool afs_login(connection_struct *conn) { - return True; + return true; } char *afs_createtoken_str(const char *username, const char *cell) diff --git a/source3/lib/afs_settoken.c b/source3/lib/afs_settoken.c index 971c145cde..c83093ff45 100644 --- a/source3/lib/afs_settoken.c +++ b/source3/lib/afs_settoken.c @@ -82,24 +82,24 @@ static bool afs_decode_token(const char *string, char **cell, if ((t = strtok_r(s, "\n", &saveptr)) == NULL) { DEBUG(10, ("strtok_r failed\n")); - return False; + return false; } *cell = SMB_STRDUP(t); if ((t = strtok_r(NULL, "\n", &saveptr)) == NULL) { DEBUG(10, ("strtok_r failed\n")); - return False; + return false; } if (sscanf(t, "%u", &result_ct.AuthHandle) != 1) { DEBUG(10, ("sscanf AuthHandle failed\n")); - return False; + return false; } if ((t = strtok_r(NULL, "\n", &saveptr)) == NULL) { DEBUG(10, ("strtok_r failed\n")); - return False; + return false; } blob = base64_decode_data_blob(t); @@ -108,7 +108,7 @@ static bool afs_decode_token(const char *string, char **cell, (blob.length != sizeof(result_ct.HandShakeKey) )) { DEBUG(10, ("invalid key: %x/%lu\n", (uint8_t)*blob.data, (unsigned long) blob.length)); - return False; + return false; } memcpy(result_ct.HandShakeKey, blob.data, blob.length); @@ -117,50 +117,50 @@ static bool afs_decode_token(const char *string, char **cell, if ((t = strtok_r(NULL, "\n", &saveptr)) == NULL) { DEBUG(10, ("strtok_r failed\n")); - return False; + return false; } if (sscanf(t, "%u", &result_ct.ViceId) != 1) { DEBUG(10, ("sscanf ViceId failed\n")); - return False; + return false; } if ((t = strtok_r(NULL, "\n", &saveptr)) == NULL) { DEBUG(10, ("strtok_r failed\n")); - return False; + return false; } if (sscanf(t, "%u", &result_ct.BeginTimestamp) != 1) { DEBUG(10, ("sscanf BeginTimestamp failed\n")); - return False; + return false; } if ((t = strtok_r(NULL, "\n", &saveptr)) == NULL) { DEBUG(10, ("strtok_r failed\n")); - return False; + return false; } if (sscanf(t, "%u", &result_ct.EndTimestamp) != 1) { DEBUG(10, ("sscanf EndTimestamp failed\n")); - return False; + return false; } if ((t = strtok_r(NULL, "\n", &saveptr)) == NULL) { DEBUG(10, ("strtok_r failed\n")); - return False; + return false; } blob = base64_decode_data_blob(t); if (blob.data == NULL) { DEBUG(10, ("Could not get ticket\n")); - return False; + return false; } *ticket = blob; *ct = result_ct; - return True; + return true; } /* @@ -206,7 +206,7 @@ static bool afs_settoken(const char *cell, tmp = strlen(cell); if (tmp >= MAXKTCREALMLEN) { DEBUG(1, ("Realm too long\n")); - return False; + return false; } strncpy(p, cell, tmp); @@ -237,7 +237,7 @@ bool afs_settoken_str(const char *token_string) char *cell; if (!afs_decode_token(token_string, &cell, &ticket, &ct)) - return False; + return false; if (geteuid() != sec_initial_uid()) ct.ViceId = getuid(); @@ -254,7 +254,7 @@ bool afs_settoken_str(const char *token_string) bool afs_settoken_str(const char *token_string) { - return False; + return false; } #endif -- 2.34.1