The branch, master has been updated
via 03ea6b5 s4:winbind/wb_samba3_protocol.c - rework it using concrete
enum values
via 75e77f9 s4:ntvfs subsystems - rework it using concrete enum values
from 9ba1087 auth/kerberos/gssapi_pac: fix compiler warnings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 03ea6b5b9e6baae3596649b9d9cfe79dbd44a9a4
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Jun 16 09:01:04 2011 +0200
s4:winbind/wb_samba3_protocol.c - rework it using concrete enum values
This changes commit 49352cafb4259503e6afb44d38db9bfd525d5e0d to comply
with kblin's plans.
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Thu Jun 16 10:14:52 CEST 2011 on sn-devel-104
commit 75e77f9fa023d81a57e7913bcbd712eae7a677b1
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Jun 16 08:39:03 2011 +0200
s4:ntvfs subsystems - rework it using concrete enum values
This changes commit 260bc987b00b3fff6c9b99211627b14e9bd0789a to comply
with metze's plans.
-----------------------------------------------------------------------
Summary of changes:
source4/ntvfs/ntvfs_generic.c | 14 ++++++++++++--
source4/ntvfs/posix/pvfs_qfileinfo.c | 6 +++++-
source4/ntvfs/posix/pvfs_search.c | 6 +++++-
source4/torture/gentest.c | 22 +++++++++++++++++++++-
source4/winbind/wb_samba3_protocol.c | 30 +++++++++++++++++++++++++++---
5 files changed, 70 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 9aa8e04..bed9c9c 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -664,9 +664,12 @@ static NTSTATUS ntvfs_map_fsinfo_finish(struct
ntvfs_module_context *ntvfs,
ZERO_STRUCT(fs->objectid_information.out.unknown);
return NT_STATUS_OK;
- default:
+ case RAW_QFS_GENERIC:
+ case RAW_QFS_UNIX_INFO:
return NT_STATUS_INVALID_LEVEL;
}
+
+ return NT_STATUS_INVALID_LEVEL;
}
/*
@@ -926,9 +929,16 @@ NTSTATUS ntvfs_map_fileinfo(TALLOC_CTX *mem_ctx,
info->unix_link_info.out.link_dest =
info2->generic.out.link_dest;
return NT_STATUS_OK;
#endif
- default:
+ case RAW_FILEINFO_GENERIC:
+ case RAW_FILEINFO_SEC_DESC:
+ case RAW_FILEINFO_EA_LIST:
+ case RAW_FILEINFO_UNIX_INFO2:
+ case RAW_FILEINFO_SMB2_ALL_EAS:
+ case RAW_FILEINFO_SMB2_ALL_INFORMATION:
return NT_STATUS_INVALID_LEVEL;
}
+
+ return NT_STATUS_INVALID_LEVEL;
}
/*
diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c
b/source4/ntvfs/posix/pvfs_qfileinfo.c
index 515819b..9284306 100644
--- a/source4/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_qfileinfo.c
@@ -331,10 +331,14 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs,
NT_STATUS_HAVE_NO_MEMORY(info->all_info2.out.fname.s);
return NT_STATUS_OK;
- default:
+ case RAW_FILEINFO_GENERIC:
+ case RAW_FILEINFO_UNIX_BASIC:
+ case RAW_FILEINFO_UNIX_INFO2:
+ case RAW_FILEINFO_UNIX_LINK:
return NT_STATUS_INVALID_LEVEL;
}
+ return NT_STATUS_INVALID_LEVEL;
}
/*
diff --git a/source4/ntvfs/posix/pvfs_search.c
b/source4/ntvfs/posix/pvfs_search.c
index 668f8d7..893f55c 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -220,9 +220,13 @@ static NTSTATUS fill_search_info(struct pvfs_state *pvfs,
file->id_both_directory_info.name.s = fname;
return NT_STATUS_OK;
- default:
+ case RAW_SEARCH_DATA_GENERIC:
+ case RAW_SEARCH_DATA_UNIX_INFO:
+ case RAW_SEARCH_DATA_UNIX_INFO2:
return NT_STATUS_INVALID_LEVEL;
}
+
+ return NT_STATUS_INVALID_LEVEL;
}
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 28e6953..9b6e7fc 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -2309,7 +2309,27 @@ static void gen_setfileinfo(int instance, union
smb_setfileinfo *info)
info->full_ea_information.in.eas = gen_ea_list();
break;
- default:
+ case RAW_SFILEINFO_GENERIC:
+ case RAW_SFILEINFO_SEC_DESC:
+ case RAW_SFILEINFO_1025:
+ case RAW_SFILEINFO_1029:
+ case RAW_SFILEINFO_1032:
+ case RAW_SFILEINFO_UNIX_BASIC:
+ case RAW_SFILEINFO_UNIX_INFO2:
+ case RAW_SFILEINFO_UNIX_LINK:
+ case RAW_SFILEINFO_UNIX_HLINK:
+ case RAW_SFILEINFO_LINK_INFORMATION:
+ case RAW_SFILEINFO_PIPE_INFORMATION:
+ case RAW_SFILEINFO_VALID_DATA_INFORMATION:
+ case RAW_SFILEINFO_SHORT_NAME_INFORMATION:
+ case RAW_SFILEINFO_1027:
+ case RAW_SFILEINFO_1030:
+ case RAW_SFILEINFO_1031:
+ case RAW_SFILEINFO_1036:
+ case RAW_SFILEINFO_1041:
+ case RAW_SFILEINFO_1042:
+ case RAW_SFILEINFO_1043:
+ case RAW_SFILEINFO_1044:
/* Untested */
break;
}
diff --git a/source4/winbind/wb_samba3_protocol.c
b/source4/winbind/wb_samba3_protocol.c
index 95861d1..f0f803d 100644
--- a/source4/winbind/wb_samba3_protocol.c
+++ b/source4/winbind/wb_samba3_protocol.c
@@ -179,9 +179,33 @@ NTSTATUS wbsrv_samba3_handle_call(struct wbsrv_samba3_call
*s3call)
return wbsrv_samba3_pam_logoff(s3call);
/* Unimplemented commands */
- default:
- DEBUG(4, ("Unimplemented winbind samba3 request %d\n",
- s3call->request->cmd));
+ case WINBINDD_GETPWSID:
+ case WINBINDD_PAM_CHAUTHTOK:
+ case WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP:
+ case WINBINDD_LOOKUPRIDS:
+ case WINBINDD_LOOKUPSIDS:
+ case WINBINDD_SIDS_TO_XIDS:
+ case WINBINDD_ALLOCATE_UID:
+ case WINBINDD_ALLOCATE_GID:
+ case WINBINDD_SHOW_SEQUENCE:
+ case WINBINDD_WINS_BYIP:
+ case WINBINDD_WINS_BYNAME:
+ case WINBINDD_GETGRLST:
+ case WINBINDD_GETSIDALIASES:
+ case WINBINDD_DSGETDCNAME:
+ case WINBINDD_INIT_CONNECTION:
+ case WINBINDD_DUAL_SIDS2XIDS:
+ case WINBINDD_DUAL_USERINFO:
+ case WINBINDD_DUAL_GETSIDALIASES:
+ case WINBINDD_DUAL_NDRCMD:
+ case WINBINDD_CCACHE_NTLMAUTH:
+ case WINBINDD_NUM_CMDS:
+ case WINBINDD_CHANGE_MACHACC:
+ case WINBINDD_PING_DC:
+ case WINBINDD_DC_INFO:
+ case WINBINDD_CCACHE_SAVE:
+ DEBUG(10, ("Unimplemented winbind samba3 request %d\n",
+ s3call->request->cmd));
break;
}
--
Samba Shared Repository
