DO NOT REPLY [Bug 4907] New: --disable-ipv6 disables -4 option

[samba-bugs at samba.org]

https://bugzilla.samba.org/show_bug.cgi?id=4907

           Summary: --disable-ipv6 disables -4 option
           Product: rsync
           Version: 2.6.9
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: trivial
          Priority: P3
         Component: core
        AssignedTo: wayned at samba.org
        ReportedBy: safari-samba-bugzilla-
                    i7c74r27jpmf2gzeer56xvafnhm66ebizpfn3mit at u.safari.iki.fi
         QAContact: rsync-qa at samba.org


# I do not like update my scripts every time I happen to run different rsync.
# So why not let -4 option exist even when someone has done --disable-ipv6 ?
#
--- rsync-2.6.9/options.c.bak   2006-11-07 16:25:52.617307000 +0200
+++ rsync-2.6.9/options.c       2007-08-21 21:12:17.462669790 +0300
@@ -533,8 +533,8 @@ static struct poptOption long_options[] 
   {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
   {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-#ifdef INET6
   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
+#ifdef INET6
   {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0
},
 #endif
   {"8-bit-output",    '8', POPT_ARG_NONE,   &allow_8bit_chars, 0, 0, 0 },
@@ -588,8 +588,8 @@ static struct poptOption long_daemon_opt
   {"bwlimit",          0,  POPT_ARG_INT,    &daemon_bwlimit, 0, 0, 0 },
   {"config",           0,  POPT_ARG_STRING, &config_file, 0, 0, 0 },
   {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
-#ifdef INET6
   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
+#ifdef INET6
   {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0
},
 #endif
   {"detach",           0,  POPT_ARG_VAL,    &no_detach, 0, 0, 0 },


-- 
Configure bugmail: https://bugzilla.samba.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug, or are watching the QA contact.