Merge pull request #71 from gcpin/1110

gendumpheader: Include both originator details or none in dump header

Author: dhruvibm

dump/tools/common/include/gendumpheader

@@ -52,21 +52,18 @@ function add_null() {
 
 # Function to add Originator details to dump header
 function add_originator_details() {
-    if [ -z "$ORIGINATOR_TYPE" ]; then
-        add_null 4
+    if [ -z "$ORIGINATOR_TYPE" ] || [ -z "$ORIGINATOR_ID" ]  ; then
+        add_null 36
         return
     fi
+
     len=${#ORIGINATOR_TYPE}
     nulltoadd=$(( SIZE_4 - len ))
     printf '%s' "$ORIGINATOR_TYPE" >> "$FILE"
     if [ "$nulltoadd" -gt 0 ]; then
         add_null "$nulltoadd"
     fi
 
-    if [ -z "$ORIGINATOR_ID" ]; then
-        add_null 32
-        return
-    fi
     len=${#ORIGINATOR_ID}
     nulltoadd=$(( SIZE_32 - len ))
     printf '%s' "$ORIGINATOR_ID" >> "$FILE"
@@ -573,4 +570,4 @@ function gen_header_package() {
 get_bmc_model_serial_number
 
 #Run gen_header_package
-gen_header_package
+gen_header_package