rpms/samba
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update the patch to the current one I posted to bugzilla.samba.org

Browse Source
This commit is contained in:
ssorce 2007-03-27 15:20:32 +00:00
parent 019e0ee6ef
commit fa0bbbc00f
1 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
samba-3.0.24-tar_options.patch
View File

@ -2,78 +2,88 @@ Index: source/client/client.c
===================================================================
--- source/client/client.c (revision 21918)
+++ source/client/client.c (working copy)
@@ -3847,6 +3847,7 @@
@@ -3847,6 +3847,8 @@
char *p;
int rc = 0;
fstring new_workgroup;
+ BOOL first_opt = True;
+ BOOL tar_opt = False;
+ BOOL service_opt = False;
struct poptOption long_options[] = {
POPT_AUTOHELP
@@ -3900,6 +3901,44 @@
@@ -3899,7 +3901,42 @@
in_client = True; /* Make sure that we tell lp_load we are */
while ((opt = poptGetNextOpt(pc)) != -1) {
- while ((opt = poptGetNextOpt(pc)) != -1) {
+ /* let's fetch the first opt, this will fetch also arg0 (program name) which we will skip
+ * and eventually the service and the password */
+ opt = poptGetNextOpt(pc);
+
+ /* bad hack to cope with the breackage the -T option would cause
+ * by eating the wrong arguments. We need to eat arg 0,[1,2] before */
+ if (first_opt) {
+ int argind = 0;
+ while (poptPeekArg(pc)) {
+ switch(argind) {
+ case 0: /* progname */
+ poptGetArg(pc); /* skip */
+ break;
+ /* skip argv 0, (program name) */
+ poptGetArg(pc);
+
+ case 1: /* service name */
+ pstrcpy(service,poptGetArg(pc));
+ /* Convert any '/' characters in the service name to '\' characters */
+ string_replace(service, '/','\\');
+
+ if (count_chars(service,'\\') < 3) {
+ d_printf("\n%s: Not enough '\\' characters in service\n",service);
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+ break;
+ case 2: /* command line provided password */
+ cmdline_auth_info.got_pass = True;
+ pstrcpy(cmdline_auth_info.password,poptGetArg(pc));
+ break;
+
+ default:
+ /* uh? garbage? */
+ d_printf("\nUnknown option: [%s]!\n", poptGetArg(pc));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+ argind++;
+ }
+ first_opt = False;
+ do {
+ /* this check is needed to insure that the -T tar option is forcibly the last one */
+ /* I see no other way to keep things sane --SSS */
+ if (tar_opt == True) {
+ d_printf("ERROR: the tar option -T MUST be the last option specified on the command line\n");
+ poptPrintUsage(pc, stderr, 0);
+ exit(-1);
+ }
+
+ /* if the service has not yet been specified lets see if it is available in the popt stack */
+ if (!service_opt && poptPeekArg(pc)) {
+ pstrcpy(service, poptGetArg(pc));
+ /* Convert any '/' characters in the service name to '\' characters */
+ string_replace(service, '/','\\');
+
+ if (count_chars(service,'\\') < 3) {
+ d_printf("\n%s: Not enough '\\' characters in service\n",service);
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+ service_opt = True;
+ }
+
+ /* if the service has already been retrieved then check if we have also a password */
+ if (service_opt && (!cmdline_auth_info.got_pass) && poptPeekArg(pc)) {
+ pstrcpy(cmdline_auth_info.password, poptGetArg(pc));
+ cmdline_auth_info.got_pass = True;
+ }
+
switch (opt) {
case 'M':
/* Messages are sent to NetBIOS name type 0x3
@@ -3959,7 +3998,7 @@
*/
optnum -= i;
for (i = 0; i < optnum; i++)
@@ -3954,13 +3991,9 @@
poptPrintUsage(pc, stderr, 0);
exit(1);
}
- /* Now we must eat (optnum - i) options - they have
- * been processed by tar_parseargs().
- */
- optnum -= i;
- for (i = 0; i < optnum; i++)
- poptGetOptArg(pc);
+ poptGetArg(pc);
}
+ /* this must be the last option, mark we have parsed it so that we know we have */
+ tar_opt = True;
break;
case 'D':
@@ -3971,8 +4010,6 @@
pstrcpy(base_directory,poptGetOptArg(pc));
@@ -3969,10 +4002,8 @@
grepable=True;
break;
}
}
- }
+ } while ((opt = poptGetNextOpt(pc)) != -1);
- poptGetArg(pc);
-
/* check for the -P option */
if ( port != 0 )
@@ -4011,23 +4048,6 @@
@@ -4011,23 +4042,6 @@
else
pstrcpy( calling_name, global_myname() );