Skip to content

Commit

Permalink
windows: remove "client compatible" option from installer
Browse files Browse the repository at this point in the history
  • Loading branch information
pstorz committed Sep 7, 2020
1 parent f563cf2 commit acc600d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
17 changes: 0 additions & 17 deletions core/platforms/win32/clientdialog.ini
Expand Up @@ -112,20 +112,3 @@ Right=290
Top=71
Bottom=84


[Field 15]
Type=Label
Text=Bacula compatibility
Left=10
Right=90
Top=128
Bottom=136

[Field 16]
Type=Checkbox
Text=compatible (new bareos features cannot be used)
Left=100
Right=290
Top=128
Bottom=136
State=0
13 changes: 0 additions & 13 deletions core/platforms/win32/winbareos.nsi
Expand Up @@ -45,7 +45,6 @@ $\r$\n\
[/CLIENTPASSWORD=password]$\r$\n\
[/CLIENTADDRESS=network address]$\r$\n\
[/CLIENTMONITORPASSWORD=password]$\r$\n\
[/CLIENTCOMPATIBLE=compatible mode <0=no,1=yes>]$\r$\n\
$\r$\n\
[/DIRECTORADDRESS=network address]$\r$\n\
[/DIRECTORNAME=name]$\r$\n\
Expand Down Expand Up @@ -84,7 +83,6 @@ Var ClientName #XXX_REPLACE_WITH_HOSTNAME_XXX
Var ClientPassword #XXX_REPLACE_WITH_FD_PASSWORD_XXX
Var ClientMonitorPassword #XXX_REPLACE_WITH_FD_MONITOR_PASSWORD_XXX
Var ClientAddress #XXX_REPLACE_WITH_FD_MONITOR_PASSWORD_XXX
Var ClientCompatible # is client compatible?

# Needed for configuring the storage config file
Var StorageName # name of the storage in the director config (Device)
Expand Down Expand Up @@ -1174,13 +1172,6 @@ Section -ConfigureConfiguration

FileWrite $R1 "s#/tmp/bareos-restores#C:/temp/bareos-restores#g$\r$\n"

#
# If we want to be compatible we uncomment the setting for "compatible = yes"
#
${If} $ClientCompatible == ${BST_CHECKED}
FileWrite $R1 "s@# compatible@compatible@g$\r$\n"
${EndIf}

#
# generated by
# find -type f -exec sed -r -n 's/.*(@.*@).*/ FileWrite $R1 "s#\1##g\$\\r\$\\n"/p' {} \; | sort | uniq
Expand Down Expand Up @@ -1498,9 +1489,6 @@ done:
${GetOptions} $cmdLineParams "/CLIENTMONITORPASSWORD=" $ClientMonitorPassword
ClearErrors

${GetOptions} $cmdLineParams "/CLIENTCOMPATIBLE=" $ClientCompatible
ClearErrors

${GetOptions} $cmdLineParams "/DIRECTORADDRESS=" $DirectorAddress
ClearErrors

Expand Down Expand Up @@ -1858,7 +1846,6 @@ ${If} ${SectionIsSelected} ${SEC_FD}
ReadINIStr $ClientPassword "$PLUGINSDIR\clientdialog.ini" "Field 4" "state"
ReadINIStr $ClientMonitorPassword "$PLUGINSDIR\clientdialog.ini" "Field 14" "state"
ReadINIStr $ClientAddress "$PLUGINSDIR\clientdialog.ini" "Field 5" "state"
ReadINIStr $ClientCompatible "$PLUGINSDIR\clientdialog.ini" "Field 16" "state"

${EndIf}
# MessageBox MB_OK "Compatible:$\r$\n$Compatible"
Expand Down

0 comments on commit acc600d

Please sign in to comment.