dss.patch 4.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123
  1. diff -Naur DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/playlist-lib.pl DSS-4_1_3.src/WebAdmin/WebAdminHtml/playlist-lib.pl
  2. --- DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/playlist-lib.pl Sat Feb 22 00:42:27 2003
  3. +++ DSS-4_1_3.src/WebAdmin/WebAdminHtml/playlist-lib.pl Fri May 9 17:50:28 2003
  4. @@ -384,7 +384,7 @@
  5. $item =~ /(.+)[:]([0-9]+)$/;
  6. $movie = $1;
  7. $wt = $2;
  8. - if ($wt == "") {
  9. + if ($wt eq "") {
  10. $wt = 10;
  11. }
  12. $movie =~ s/\"/\"\"/g;
  13. @@ -669,7 +669,7 @@
  14. $item =~ /(.+)[:]([0-9]+)$/;
  15. $movie = $1;
  16. $wt = $2;
  17. - if ($wt == "") {
  18. + if ($wt eq "") {
  19. $wt = 10;
  20. }
  21. $htmlstr .= &playlistlib::EmitPLRemoveMovieTableRowHTML($movie, $wt, $label);
  22. @@ -769,7 +769,7 @@
  23. $item =~ /(.+)[:]([0-9]+)$/;
  24. $movie = $1;
  25. $wt = $2;
  26. - if ($wt == "") {
  27. + if ($wt eq "") {
  28. $wt = 10;
  29. }
  30. $htmlstr .= &playlistlib::EmitPLDetailTableRowHTML($movie, $wt, $i, $label);
  31. diff -Naur DSS-4_1_3.src.orig/qtaccess DSS-4_1_3.src/qtaccess
  32. --- DSS-4_1_3.src.orig/qtaccess Sat Feb 22 00:42:15 2003
  33. +++ DSS-4_1_3.src/qtaccess Mon Jun 2 17:28:44 2003
  34. @@ -1,9 +1,9 @@
  35. # qtaccess
  36. -# A sample access file for streaming
  37. -# server authorization
  38. +# A sample access file for streaming
  39. +# server authorization
  40. # ----------------------------------
  41. -# Note:
  42. -# For each keyword, the first sentence in the comment
  43. +# Note:
  44. +# For each keyword, the first sentence in the comment
  45. # explains the keyword, and the usage: line explains
  46. # how to use it. Anything not in angle brackets is a keyword
  47. # and keywords are case-sensitive.
  48. @@ -12,31 +12,29 @@
  49. # AuthScheme: The authentication scheme that will be used
  50. # usage: AuthScheme <scheme>
  51. # where scheme is either "basic" or "digest"
  52. -AuthScheme basic
  53. +AuthScheme digest
  54. # AuthName: The authentication realm that will be
  55. # presented to the client (for Basic Authentication only)
  56. # usage: AuthName <realm>
  57. # where realm can be a single word or a quoted multi-word string
  58. -AuthName "streaming server realm"
  59. +AuthName "Streaming Server"
  60. # AuthUserFile: The filename that contains the list of users
  61. -# for this access file
  62. +# for this access file
  63. # If not given, the default filename is /Library/QuickTimeStreaming/Config/qtusers for MacOSX
  64. -# If not given, the default filename is /etc/streaming/qtusers for POSIX
  65. +# If not given, the default filename is @l_prefix@/etc/dss/qtusers for POSIX
  66. # usage: AuthUserFile <user filename>
  67. -#AuthUserFile /etc/streaming/qtusers
  68. -AuthUserFile /Library/QuickTimeStreaming/Config/qtusers
  69. +AuthUserFile @l_prefix@/etc/dss/qtusers
  70. -# AuthGroupFile: The filename that contains the groups and the
  71. +# AuthGroupFile: The filename that contains the groups and the
  72. # users that belong to each group
  73. # If not given, the default filename is /Library/QuickTimeStreaming/Config/qtgroups for MacOSX
  74. -# If not given, the default filename is /etc/streaming/qtgroups for POSIX
  75. +# If not given, the default filename is @l_prefix@/etc/dss/qtgroups for POSIX
  76. # usage: AuthGroupFile <group filename>
  77. -#AuthGroupFile /etc/streaming/qtgroups
  78. -AuthGroupFile /Library/QuickTimeStreaming/Config/qtgroups
  79. +AuthGroupFile @l_prefix@/etc/dss/qtgroups
  80. -# require user: The names next to this specify which user
  81. +# require user: The names next to this specify which user
  82. # is allowed to access the media in this folder
  83. # below are two special cases:
  84. # require any-user => implies any user is allowed without
  85. @@ -44,24 +42,24 @@
  86. # require valid-user => implies any user that is
  87. # authenticated is allowed access
  88. # usage: require user <username1> <username2> ...
  89. -require user johndoe
  90. +require any-user
  91. # require group: The names of the groups that are allowed
  92. # access to the media in this folder
  93. # usage: require group <groupname1> <groupname2> ...
  94. -require group movie-watchers
  95. # <Limit READ/WRITE>: This directive is to specify access control
  96. # for READ and/or WRITE privileges. If not present, all access control
  97. # keywords apply to READ privileges only.
  98. -# <Limit WRITE> is used for WRITE privileges, and <Limit READ WRITE> for
  99. +# <Limit WRITE> is used for WRITE privileges, and <Limit READ WRITE> for
  100. # both. <Limit READ> can be omitted as the access keywords outside the
  101. # Limit directive
  102. # usage: <Limit [READ|WRITE] ..> ... </Limit>
  103. -<Limit WRITE>
  104. - AuthName "streaming server broadcaster realm"
  105. - AuthUserFile /Library/QuickTimeStreaming/Config/qtbroadcastusers
  106. - AuthGroupFile /Library/QuickTimeStreaming/Config/qtbroadcastgroups
  107. - require group broadcaster
  108. -</Limit>
  109. +
  110. +#<Limit WRITE>
  111. +# AuthName "Streaming Server Broadcaster"
  112. +# AuthUserFile @l_prefix@/etc/dss/qtbroadcastusers
  113. +# AuthGroupFile @l_prefix@/etc/dss/qtbroadcastgroups
  114. +# require group broadcaster
  115. +#</Limit>