Check-in [8ae4b53c31]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:8ae4b53c31b8aae256a81dc1145c50d0fe1f191e
Date: 2012-02-18 01:09:54
User: BarryK
Comment:rerwin: fix pupdial when empty username and password

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/sbin/pupdial

@@ -28,10 +28,11 @@
 #101211 update PupDial if modem changes.
 #101217 new help button, for modem setup.
 #101218 passed param if re-run this script do not do probe of hotpluggable modems.
 #110505 support sudo for non-root user.
 #120202 rodin.s: internationalized.
+#120218 rerwin: Ensure non-null logon info for wvdial.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=pupdial
 export TEXTDOMAINDIR=/usr/share/locale
@@ -698,10 +699,16 @@
 [ "$CHECKDT" = "false" -a "$CHECKBC" = "false" ] && DIALSTR="ATX1"
 [ "$CHECKDT" = "true" -a "$CHECKBC" = "false" ] && DIALSTR="ATX2"
 DIALSTR="${DIALSTR}${DIALTYPE}"
 [ "$DEVMALT" = "" ] && DEVMALTLINE="" || DEVMALTLINE="#Modem = /dev/${DEVMALT}
 "
+
+#120218 rerwin: Ensure non-null logon info for wvdial...
+[ ! ${ENTRYACC1USER} ] && ENTRYACC1USER="MYUSERNAME"
+[ ! ${ENTRYACC1PASS} ] && ENTRYACC1PASS="MYPASSWORD"
+[ ! ${ENTRYACC2USER} ] && ENTRYACC2USER="MY2USERNAME"
+[ ! ${ENTRYACC2PASS} ] && ENTRYACC2PASS="MY2PASSWORD"
 
 echo '[Dialer Defaults]' > /etc/wvdial.conf
 echo -n "Modem = /dev/${DEVM}
 ${DEVMALTLINE}Baud = ${ENTRYBAUDM}
 Init1 =

Changes to woof-code/rootfs-skeleton/usr/share/sss/desk_strings/desk_strings

@@ -6,11 +6,11 @@
 #and t12s methods are run-time translations. "desk_strings" is really only suited to static target files.
 #the translations in this SSS-domain, that is, this file desk_strings*, are performed by /usr/sbin/fixdesk,
 #which in turn is called from quicksetup (chooselocale) whenever locale is changed, also by rc.update whenever a version upgrade.
 #the section-ids are a full path, for example _root_Choices_ROX-Filer_PuppyPin means /root/Choices/ROX-Filer/PuppyPin.
 # ...i originally imposed this substitution for / as i thought there might be a problem with having / in the section-id
-#    however, now i think not. anyway, fixscripts will accept any substitution, ex ZrootZChoicesZROX-FilerZPuppyPin
+#    however, now i think not. anyway, fixdesk will accept any substitution, ex ZrootZChoicesZROX-FilerZPuppyPin
 #Please type translation only between the last two % characters.
 #Keep all formatting exactly the same, that is retain all " ' < > / \ characters.
 # -- do not replace the " and ' with left-side or right-side quote characters.
 #Keep all variables as-is, exs: ${DROPOUT} $DROPOUT -- do not translate!
 

Changes to woof-code/rootfs-skeleton/usr/share/sss/desk_strings/desk_strings.de

@@ -6,11 +6,11 @@
 #and t12s methods are run-time translations. "desk_strings" is really only suited to static target files.
 #the translations in this SSS-domain, that is, this file desk_strings*, are performed by /usr/sbin/fixdesk,
 #which in turn is called from quicksetup (chooselocale) whenever locale is changed, also by rc.update whenever a version upgrade.
 #the section-ids are a full path, for example _root_Choices_ROX-Filer_PuppyPin means /root/Choices/ROX-Filer/PuppyPin.
 # ...i originally imposed this substitution for / as i thought there might be a problem with having / in the section-id
-#    however, now i think not. anyway, fixscripts will accept any substitution, ex ZrootZChoicesZROX-FilerZPuppyPin
+#    however, now i think not. anyway, fixdesk will accept any substitution, ex ZrootZChoicesZROX-FilerZPuppyPin
 #Please type translation only between the last two % characters.
 #Keep all formatting exactly the same, that is retain all " ' < > / \ characters.
 # -- do not replace the " and ' with left-side or right-side quote characters.
 #Keep all variables as-is, exs: ${DROPOUT} $DROPOUT -- do not translate!