Fix possible NULL dereference in super_by_fd

[thirdparty/mdadm.git] / mdadm.c

diff --git a/mdadm.c b/mdadm.c
index b4b503dd288b1b70ec27419350d0b9d385aaf284..67823d50059a9b273534b5d48a2fc605aed6b025 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -199,7 +199,8 @@ int main(int argc, char *argv[])
                case 'G': newmode = GROW;
                        shortopt = short_bitmap_options;
                        break;
-               case 'I': newmode = INCREMENTAL; break;
+               case 'I': newmode = INCREMENTAL;
+                       shortopt = short_bitmap_auto_options; break;
                case AutoDetect:
                        newmode = AUTODETECT; break;
 
@@ -511,6 +512,7 @@ int main(int argc, char *argv[])
 
                case O(CREATE,'a'):
                case O(BUILD,'a'):
+               case O(INCREMENTAL,'a'):
                case O(ASSEMBLE,'a'): /* auto-creation of device node */
                        autof = parse_auto(optarg, "--auto flag", 0);
                        continue;
@@ -702,7 +704,7 @@ int main(int argc, char *argv[])
                        test = 1;
                        continue;
                case O(MONITOR,'y'): /* log messages to syslog */
-                       openlog("mdadm", 0, SYSLOG_FACILITY);
+                       openlog("mdadm", LOG_PID, SYSLOG_FACILITY);
                        dosyslog = 1;
                        continue;
 
@@ -1200,7 +1202,9 @@ int main(int argc, char *argv[])
                        }
                        if (brief && verbose)
                                brief = 2;
-                       rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss, homehost);
+                       rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief,
+                                    export, scan,
+                                    SparcAdjust, ss, homehost);
                } else {
                        if (devlist == NULL) {
                                if (devmode=='D' && scan) {