RFA: Misapplied patch to _initialize_gdb_osabi?

[Jim Blandy <jimb@redhat.com>]

CVS says that revision 1.17 to gdb/osabi.c (ChangeLog entry attached)
made the following change:

2003-08-24  Andrew Cagney  <cagney@redhat.com>

	* arm-tdep.c (_initialize_arm_tdep): Simplify by assuming
	GDB_MULTI_ARCH is always non-zero.
	* osabi.c (_initialize_gdb_osabi): Ditto.
	(gdbarch_init_osabi): Ditto.
	* sparc-tdep.c: Ditto for #if code.

***************
*** 571,578 ****
  				  bfd_target_elf_flavour,
  				  generic_elf_osabi_sniffer);
  
!   if (!GDB_MULTI_ARCH)
!     return;
  
    /* Register the "set osabi" command.  */
    c = add_set_enum_cmd ("osabi", class_support, gdb_osabi_available_names,
--- 567,573 ----
  				  bfd_target_elf_flavour,
  				  generic_elf_osabi_sniffer);
  
!   return;
  
    /* Register the "set osabi" command.  */
    c = add_set_enum_cmd ("osabi", class_support, gdb_osabi_available_names,

This does the opposite of what the log comment says.  Is the patch
below correct?

2003-11-03  Jim Blandy  <jimb@redhat.com>

	* osabi.c (_initialize_gdb_osabi): Don't return before registering
	the 'set osabi' and 'show osabi' commands.

Index: gdb/osabi.c
===================================================================
RCS file: /cvs/src/src/gdb/osabi.c,v
retrieving revision 1.21
diff -c -r1.21 osabi.c
*** gdb/osabi.c	27 Oct 2003 16:18:23 -0000	1.21
--- gdb/osabi.c	3 Nov 2003 22:08:39 -0000
***************
*** 593,600 ****
  				  bfd_target_elf_flavour,
  				  generic_elf_osabi_sniffer);
  
-   return;
- 
    /* Register the "set osabi" command.  */
    c = add_set_enum_cmd ("osabi", class_support, gdb_osabi_available_names,
  			&set_osabi_string, "Set OS ABI of target.", &setlist);
--- 593,598 ----