svn commit: samba r12456 - in trunk/source: auth include
vlendec at samba.org
vlendec at samba.org
Fri Dec 23 20:25:14 GMT 2005
Author: vlendec
Date: 2005-12-23 20:25:13 +0000 (Fri, 23 Dec 2005)
New Revision: 12456
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12456
Log:
Remove a write-only struct member
Modified:
trunk/source/auth/auth_sam.c
trunk/source/auth/auth_util.c
trunk/source/include/auth.h
Changeset:
Modified: trunk/source/auth/auth_sam.c
===================================================================
--- trunk/source/auth/auth_sam.c 2005-12-23 19:21:05 UTC (rev 12455)
+++ trunk/source/auth/auth_sam.c 2005-12-23 20:25:13 UTC (rev 12456)
@@ -183,8 +183,8 @@
while (next_token(&s, tok, ",", sizeof(tok))) {
- DEBUG(10,("sam_account_ok: checking for workstation match %s and %s (len=%d)\n",
- tok, user_info->wksta_name.str, user_info->wksta_name.len));
+ DEBUG(10,("sam_account_ok: checking for workstation match %s and %s\n",
+ tok, user_info->wksta_name.str));
if(strequal(tok, user_info->wksta_name.str)) {
invalid_ws = False;
break;
Modified: trunk/source/auth/auth_util.c
===================================================================
--- trunk/source/auth/auth_util.c 2005-12-23 19:21:05 UTC (rev 12455)
+++ trunk/source/auth/auth_util.c 2005-12-23 20:25:13 UTC (rev 12456)
@@ -79,41 +79,31 @@
DEBUG(5,("making strings for %s's user_info struct\n", internal_username));
(*user_info)->smb_name.str = SMB_STRDUP(smb_name);
- if ((*user_info)->smb_name.str) {
- (*user_info)->smb_name.len = strlen(smb_name);
- } else {
+ if ((*user_info)->smb_name.str == NULL) {
free_user_info(user_info);
return NT_STATUS_NO_MEMORY;
}
(*user_info)->internal_username.str = SMB_STRDUP(internal_username);
- if ((*user_info)->internal_username.str) {
- (*user_info)->internal_username.len = strlen(internal_username);
- } else {
+ if ((*user_info)->internal_username.str == NULL) {
free_user_info(user_info);
return NT_STATUS_NO_MEMORY;
}
(*user_info)->domain.str = SMB_STRDUP(domain);
- if ((*user_info)->domain.str) {
- (*user_info)->domain.len = strlen(domain);
- } else {
+ if ((*user_info)->domain.str == NULL) {
free_user_info(user_info);
return NT_STATUS_NO_MEMORY;
}
(*user_info)->client_domain.str = SMB_STRDUP(client_domain);
- if ((*user_info)->client_domain.str) {
- (*user_info)->client_domain.len = strlen(client_domain);
- } else {
+ if ((*user_info)->client_domain.str == NULL) {
free_user_info(user_info);
return NT_STATUS_NO_MEMORY;
}
(*user_info)->wksta_name.str = SMB_STRDUP(wksta_name);
- if ((*user_info)->wksta_name.str) {
- (*user_info)->wksta_name.len = strlen(wksta_name);
- } else {
+ if ((*user_info)->wksta_name.str == NULL) {
free_user_info(user_info);
return NT_STATUS_NO_MEMORY;
}
Modified: trunk/source/include/auth.h
===================================================================
--- trunk/source/include/auth.h 2005-12-23 19:21:05 UTC (rev 12455)
+++ trunk/source/include/auth.h 2005-12-23 20:25:13 UTC (rev 12456)
@@ -22,7 +22,6 @@
/* AUTH_STR - string */
typedef struct normal_string {
- int len;
char *str;
} AUTH_STR;
More information about the samba-cvs
mailing list